progress
This commit is contained in:
parent
d455e613e0
commit
c3183eed1e
3
etc/base
3
etc/base
|
@ -1,6 +1,9 @@
|
||||||
packages() {
|
packages() {
|
||||||
addpkg base-system sudo void-repo-multilib void-repo-multilib-nonfree void-repo-nonfree lvm2 cronie socklog-void ntp xtools wireguard-tools gnupg progress pwgen net-tools ncdu nmap mtr bind-utils iotop hdparm smartmontools htop git neovim btrbk croc grub-btrfs nano mbuffer cryptsetup psmisc pinentry-tty pciutils iproute2 iputils iperf unzip usbutils wget
|
addpkg base-system sudo void-repo-multilib void-repo-multilib-nonfree void-repo-nonfree lvm2 cronie socklog-void ntp xtools wireguard-tools gnupg progress pwgen net-tools ncdu nmap mtr bind-utils iotop hdparm smartmontools htop git neovim btrbk croc grub-btrfs nano mbuffer cryptsetup psmisc pinentry-tty pciutils iproute2 iputils iperf unzip usbutils wget
|
||||||
ignorepkg nvi
|
ignorepkg nvi
|
||||||
|
if [ "${EFI}" == "1" ]; then
|
||||||
|
addpkg ckbcomp
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
config() {
|
config() {
|
||||||
|
|
|
@ -27,6 +27,7 @@ config() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! [ "${KEY_LANG}" == "en" ]; then
|
if ! [ "${KEY_LANG}" == "en" ]; then
|
||||||
|
if [ "${EFI}" == "1" ]; then
|
||||||
VGUUID=$(vgdisplay |grep UUID|awk '{print $3}')
|
VGUUID=$(vgdisplay |grep UUID|awk '{print $3}')
|
||||||
LVUUID=$(lvdisplay ${TARGETNAME_UNDERSCORE}-root |grep UUID|awk '{print $3}')
|
LVUUID=$(lvdisplay ${TARGETNAME_UNDERSCORE}-root |grep UUID|awk '{print $3}')
|
||||||
rl=$(basename $(readlink "${TARGET_PHY_ID}-part${TARGET_PART}"))
|
rl=$(basename $(readlink "${TARGET_PHY_ID}-part${TARGET_PART}"))
|
||||||
|
@ -49,6 +50,7 @@ config() {
|
||||||
cp -f grubx64.efi /boot/efi/EFI/void/grubx64.efi
|
cp -f grubx64.efi /boot/efi/EFI/void/grubx64.efi
|
||||||
|
|
||||||
rm -rf grubx64.efi memdisk.tar ${KEY_LANG}.gkb
|
rm -rf grubx64.efi memdisk.tar ${KEY_LANG}.gkb
|
||||||
|
fi
|
||||||
if ! grep -q rd.console.keymap /etc/default/grub; then
|
if ! grep -q rd.console.keymap /etc/default/grub; then
|
||||||
sed -i "/^GRUB_CMDLINE_LINUX_DEFAULT/s/=\"/=\" rd.vconsole.keymap=${L2} /" /etc/default/grub
|
sed -i "/^GRUB_CMDLINE_LINUX_DEFAULT/s/=\"/=\" rd.vconsole.keymap=${L2} /" /etc/default/grub
|
||||||
fi
|
fi
|
||||||
|
|
2
main.sh
2
main.sh
|
@ -320,7 +320,7 @@ do_chroot() {
|
||||||
|
|
||||||
cat <<EOF > "${target}/tmp/vinstaller/main_chroot"
|
cat <<EOF > "${target}/tmp/vinstaller/main_chroot"
|
||||||
#!/usr/bin/bash
|
#!/usr/bin/bash
|
||||||
|
cd /tmp/vinstaller
|
||||||
FILESDIR=/tmp/vinstaller/files
|
FILESDIR=/tmp/vinstaller/files
|
||||||
|
|
||||||
. /tmp/vinstaller/functions
|
. /tmp/vinstaller/functions
|
||||||
|
|
Loading…
Reference in New Issue
Block a user