From f086d5507171849b6e11e7f083f8cff6bf327504 Mon Sep 17 00:00:00 2001 From: natemaia Date: Sun, 16 Dec 2018 00:34:16 -0800 Subject: [PATCH] Fix: error creating keyboard config in vm due to removal of xorg dir --- src/lib/boot.sh | 5 ++++- src/lib/install.sh | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/boot.sh b/src/lib/boot.sh index b2b84b9..3a6be2e 100644 --- a/src/lib/boot.sh +++ b/src/lib/boot.sh @@ -217,7 +217,7 @@ EOF install_bootloader() { if ! [[ $ROOT_PART =~ /dev/mapper ]]; then - if [[ $BOOTLDR == 'syslinux' && $SYS == 'BIOS' ]]; then + if [[ $BOOTLDR == 'syslinux' ]]; then ROOT_PART_ID="UUID=$(blkid -s UUID -o value $ROOT_PART)" else ROOT_PART_ID="UUID=$(blkid -s PARTUUID -o value $ROOT_PART)" @@ -227,6 +227,9 @@ install_bootloader() ROOT_PART_ID="$ROOT_PART" fi + # for virtual machine remove the ucode + [[ $VM ]] && UCODE="" + # remove old UEFI boot entries if [[ $SYS == 'UEFI' ]]; then find ${MNT}${BMNTS[$SYS-$BOOTLDR]}/EFI/ \ diff --git a/src/lib/install.sh b/src/lib/install.sh index 3ffaca3..b46a166 100644 --- a/src/lib/install.sh +++ b/src/lib/install.sh @@ -138,6 +138,7 @@ EOF fi # set the keymaps + mkdir -p $MNT/etc/X11/xorg.conf.d cat > $MNT/etc/X11/xorg.conf.d/00-keyboard.conf <