teldra
/
vinstaller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

progress

This commit is contained in:
teldra 2022-02-09 14:00:29 +01:00
parent d455e613e0
commit c3183eed1e
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/base
View File

@ -1,6 +1,9 @@
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
ignorepkg nvi
if [ "${EFI}" == "1" ]; then
addpkg ckbcomp
fi
}
config() {

40
etc/bootloader/grub
View File

@ -27,28 +27,30 @@ config() {
fi
if ! [ "${KEY_LANG}" == "en" ]; then
VGUUID=$(vgdisplay |grep UUID|awk '{print $3}')
LVUUID=$(lvdisplay ${TARGETNAME_UNDERSCORE}-root |grep UUID|awk '{print $3}')
rl=$(basename $(readlink "${TARGET_PHY_ID}-part${TARGET_PART}"))
TMP=$(lsblk -o NAME,UUID -l|grep "${rl}" | awk '{print $2}')
CRYPTUUID=${TMP//-/}
grub-kbdcomp -o ${KEY_LANG}.gkb ${KEY_LANG}
tar cf memdisk.tar ${KEY_LANG}.gkb
if [ "${EFI}" == "1" ]; then
VGUUID=$(vgdisplay |grep UUID|awk '{print $3}')
LVUUID=$(lvdisplay ${TARGETNAME_UNDERSCORE}-root |grep UUID|awk '{print $3}')
rl=$(basename $(readlink "${TARGET_PHY_ID}-part${TARGET_PART}"))
TMP=$(lsblk -o NAME,UUID -l|grep "${rl}" | awk '{print $2}')
CRYPTUUID=${TMP//-/}
grub-kbdcomp -o ${KEY_LANG}.gkb ${KEY_LANG}
tar cf memdisk.tar ${KEY_LANG}.gkb
echo "set root=(memdisk)" >> /boot/grub/early-grub.cfg
echo "set prefix=($root)/" >> /boot/grub/early-grub.cfg
echo "terminal_input at_keyboard" >> /boot/grub/early-grub.cfg
echo "keymap /dvorak.gkb" >> /boot/grub/early-grub.cfg
echo "cryptomount -u 1234abcdef1234abcdef1234abcdef" >> /boot/grub/early-grub.cfg
echo "set root='cryptouuid/1234abcdef1234abcdef1234abcdef'" >> /boot/grub/early-grub.cfg
echo "set prefix=($root)/grub" >> /boot/grub/early-grub.cfg
echo "configfile grub.cfg" >> /boot/grub/early-grub.cfg
echo "set root=(memdisk)" >> /boot/grub/early-grub.cfg
echo "set prefix=($root)/" >> /boot/grub/early-grub.cfg
echo "terminal_input at_keyboard" >> /boot/grub/early-grub.cfg
echo "keymap /dvorak.gkb" >> /boot/grub/early-grub.cfg
echo "cryptomount -u 1234abcdef1234abcdef1234abcdef" >> /boot/grub/early-grub.cfg
echo "set root='cryptouuid/1234abcdef1234abcdef1234abcdef'" >> /boot/grub/early-grub.cfg
echo "set prefix=($root)/grub" >> /boot/grub/early-grub.cfg
echo "configfile grub.cfg" >> /boot/grub/early-grub.cfg
mkdir -p /boot/grub/
grub-mkimage -c /boot/grub/early-grub.cfg -o grubx64.efi -O x86_64-efi -m memdisk.tar memdisk tar at_keyboard keylayouts configfile
cp -f grubx64.efi /boot/efi/EFI/void/grubx64.efi
mkdir -p /boot/grub/
grub-mkimage -c /boot/grub/early-grub.cfg -o grubx64.efi -O x86_64-efi -m memdisk.tar memdisk tar at_keyboard keylayouts configfile
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
sed -i "/^GRUB_CMDLINE_LINUX_DEFAULT/s/=\"/=\" rd.vconsole.keymap=${L2} /" /etc/default/grub
fi

2
main.sh
View File

@ -320,7 +320,7 @@ do_chroot() {
cat <<EOF > "${target}/tmp/vinstaller/main_chroot"
#!/usr/bin/bash
cd /tmp/vinstaller
FILESDIR=/tmp/vinstaller/files
. /tmp/vinstaller/functions