This commit is contained in:
teldra 2022-02-09 19:33:39 +01:00
parent 20c60993c8
commit 44798cd839
1 changed files with 8 additions and 7 deletions

View File

@ -28,12 +28,11 @@ config() {
if ! [ "${KEY_LANG}" == "en" ]; then
if [ "${EFI}" == "1" ]; then
VGUUID=$(vgdisplay |grep UUID|awk '{print $3}')
LVUUID=$(lvdisplay "/dev/mapper/vg_${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//-/}
BTRFSUUID=$()
VGUUID="$(vgdisplay |grep UUID|awk '{print $3}')"
LVUUID="$(lvdisplay "/dev/mapper/vg_${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//-/}"
mkdir -p /boot/efi/EFI/void /boot/grub
grub-kbdcomp -o /boot/grub/${KEY_LANG}.gkb ${KEY_LANG}
@ -63,7 +62,9 @@ config() {
echo "set prefix=($root)/rootfs/boot/grub" >> /boot/grub/early-grub.cfg
echo "configfile grub.cfg" >> /boot/grub/early-grub.cfg
echo "cp -rf /boot/grub/memdisk.tar /boot/grub/early-grub.cfg ." > /usr/bin/gen-grub
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
chmod +x /usr/bin/gen-grub