From 0b1f52128a85d60394282301f91d6a43c8b3e403 Mon Sep 17 00:00:00 2001 From: teldra Date: Wed, 9 Feb 2022 19:55:42 +0100 Subject: [PATCH] progress --- etc/bootloader/grub | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/etc/bootloader/grub b/etc/bootloader/grub index a6fbd1c..4d051e7 100644 --- a/etc/bootloader/grub +++ b/etc/bootloader/grub @@ -56,7 +56,7 @@ config() { echo "insmod configfile" >> /boot/grub/early-grub.cfg echo "insmod all_video" >> /boot/grub/early-grub.cfg echo "terminal_input at_keyboard" >> /boot/grub/early-grub.cfg - echo "keymap /${KEY_LANG}.gkb" >> /boot/grub/early-grub.cfg + echo "keymap /boot/grub/${KEY_LANG}.gkb" >> /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 @@ -64,12 +64,11 @@ config() { 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 early-grub.cfg -o grubx64_de.efi -O x86_64-efi -m 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 "rm -rf memdisk.tar early-grub.cfg" >> /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 chmod +x /usr/bin/gen-grub gen-grub - mv grubx64_de.efi /boot/efi/EFI/void/grubx64_de.efi + mv -f /grubx64_de.efi /boot/efi/EFI/void/grubx64_de.efi fi if ! grep -q rd.console.keymap /etc/default/grub; then