diff --git a/etc/bootloader/grub b/etc/bootloader/grub index 9a156ed..e8b24dc 100644 --- a/etc/bootloader/grub +++ b/etc/bootloader/grub @@ -38,8 +38,8 @@ config() { grub-kbdcomp -o /boot/grub/${KEY_LANG}.gkb ${KEY_LANG} tar cf /boot/grub/memdisk.tar /boot/grub/${KEY_LANG}.gkb - echo "set root=(memdisk)" > /boot/grub/early-grub.cfg - echo "set prefix=(\$root)/" >> /boot/grub/early-grub.cfg + #echo "set root=(memdisk)" > /boot/grub/early-grub.cfg + #echo "set prefix=(\$root)/" >> /boot/grub/early-grub.cfg echo "insmod gzio" >> /boot/grub/early-grub.cfg echo "insmod part_gpt" >> /boot/grub/early-grub.cfg echo "insmod cryptodisk" >> /boot/grub/early-grub.cfg @@ -57,14 +57,12 @@ 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 "ls" >> /boot/grub/early-grub.cfg - echo "echo 'second'" >> /boot/grub/early-grub.cfg + #echo "cryptomount -u ${CRYPTUUID}" >> /boot/grub/early-grub.cfg echo "cryptomount -a" >> /boot/grub/early-grub.cfg + echo "unset prefix" >> /boot/grub/early-grub.cfg echo "set root='lvm/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 "configfile (\$root)/rootfs/boot/grub.cfg" >> /boot/grub/early-grub.cfg echo "#!/bin/bash" > /usr/bin/gen-grub echo "cd /" >> /usr/bin/gen-grub