From 875b8738ba17eb327da9373622a87bb79680bf75 Mon Sep 17 00:00:00 2001 From: natemaia Date: Sun, 16 Dec 2018 00:24:44 -0800 Subject: [PATCH] Fix: syslinux UUID --- lang/english.trans | 2 +- src/lib/boot.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lang/english.trans b/lang/english.trans index 6013b1c..d20fd58 100644 --- a/lang/english.trans +++ b/lang/english.trans @@ -79,7 +79,7 @@ _PackageBody="\nUse [Space] to (de)select packages(s) to install from the list b _WMLogin="Select Login Managment" _LoginTypeBody="\nSelect how you want to log in, using a display manager or xinit." _WMLoginBody="\nSelect which window manager or desktop to use as your primary login.\n\nThis can be changed by editing your ~/.xinitrc" -_AutoLoginBody="\nDo you want to enable auto-login and have 'startx' run when the computer starts?" +_AutoLoginBody="\nDo you want autologin and auto-startx enabled for your user?" # Set keymap, hwclock, local and timezone _CMapTitle="Virtual Console Keymap" diff --git a/src/lib/boot.sh b/src/lib/boot.sh index b496fa1..b2b84b9 100644 --- a/src/lib/boot.sh +++ b/src/lib/boot.sh @@ -217,7 +217,11 @@ EOF install_bootloader() { if ! [[ $ROOT_PART =~ /dev/mapper ]]; then - ROOT_PART_ID="UUID=$(blkid -s PARTUUID -o value $ROOT_PART)" + if [[ $BOOTLDR == 'syslinux' && $SYS == 'BIOS' ]]; then + ROOT_PART_ID="UUID=$(blkid -s UUID -o value $ROOT_PART)" + else + ROOT_PART_ID="UUID=$(blkid -s PARTUUID -o value $ROOT_PART)" + fi else # for LVM we just use the partition label ROOT_PART_ID="$ROOT_PART"