diff --git a/etc/bootloader/grub b/etc/bootloader/grub index 4d051e7..3903be9 100644 --- a/etc/bootloader/grub +++ b/etc/bootloader/grub @@ -57,18 +57,21 @@ config() { echo "insmod all_video" >> /boot/grub/early-grub.cfg echo "terminal_input at_keyboard" >> /boot/grub/early-grub.cfg echo "keymap /boot/grub/${KEY_LANG}.gkb" >> /boot/grub/early-grub.cfg + echo "echo 'first'" >> /boot/grub/early-grub.cfg echo "cryptomount -u ${CRYPTUUID}" >> /boot/grub/early-grub.cfg - echo "set root='lvmid/${VGUUID}/${LVUUID}'" >> /boot/grub/early-grub.cfg - echo "set prefix=($root)/rootfs/boot/grub" >> /boot/grub/early-grub.cfg - echo "configfile grub.cfg" >> /boot/grub/early-grub.cfg + echo "echo 'second'" >> /boot/grub/early-grub.cfg + echo "cryptomount -a" >> /boot/grub/early-grub.cfg + echo "set root='lvm/vg_${TARGETNAME_UNDERSCORE}/vg_${TARGETNAME_UNDERSCORE}-root'" >> /boot/grub/early-grub.cfg + #echo "set prefix=($root)/rootfs/boot/grub" >> /boot/grub/early-grub.cfg + echo "configfile ($root)/boot/grub.cfg" >> /boot/grub/early-grub.cfg echo "#!/bin/bash" > /usr/bin/gen-grub echo "cd /" >> /usr/bin/gen-grub #echo "cp -rf /boot/grub/memdisk.tar /boot/grub/early-grub.cfg ." >> /usr/bin/gen-grub echo "grub-mkimage -c /boot/grub/early-grub.cfg -o grubx64_de.efi -O x86_64-efi -m /boot/grub/memdisk.tar gzio part_gpt cryptodisk luks gcry_rijndael gcry_rijndael gcry_sha256 lvm btrfs memdisk tar at_keyboard keylayouts configfile all_video" >> /usr/bin/gen-grub + echo "mv -f /grubx64_de.efi /boot/efi/EFI/void/grubx64_de.efi" >> /usr/bin/gen-grub chmod +x /usr/bin/gen-grub gen-grub - mv -f /grubx64_de.efi /boot/efi/EFI/void/grubx64_de.efi fi if ! grep -q rd.console.keymap /etc/default/grub; then