diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2015-08-18 22:35:57 +0100 |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2015-08-18 22:35:57 +0100 |
| commit | 9ae80494f13a64d6ebaff2f34048b49c45973f03 (patch) | |
| tree | 4b2695a7781aaea9b70e3dbe50b5c03924f1df1a | |
| parent | 0925e7d1acad14f876be5717414fd0663be6305f (diff) | |
| download | librebootfr-9ae80494f13a64d6ebaff2f34048b49c45973f03.tar.gz librebootfr-9ae80494f13a64d6ebaff2f34048b49c45973f03.zip | |
grub.cfg: refer to variables properly
| -rw-r--r-- | resources/grub/config/menuentries/common.cfg | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg index 3e66425f..b153484b 100644 --- a/resources/grub/config/menuentries/common.cfg +++ b/resources/grub/config/menuentries/common.cfg @@ -26,7 +26,7 @@ menuentry 'Parse ISOLINUX menu (ahci0)' { insmod part_msdos insmod part_gpt for x in (ahci0,1) (ahci0,2) (ahci0,3) (ahci0,4); do - set root=$x + set root=${x} for path in "/isolinux/isolinux.cfg" "/syslinux/syslinux.cfg" "/boot/isolinux/isolinux.cfg" "/boot/syslinux/syslinux.cfg"; do if [ -f "${path}" ]; then syslinux_configfile -i ${path} @@ -39,7 +39,7 @@ menuentry 'Parse ISOLINUX menu (USB)' { insmod part_msdos insmod part_gpt for x in (usb0) (usb0,1) (usb0,2) (usb0,3) (usb0,4); do - set root=$x + set root=${x} for path in "/isolinux/isolinux.cfg" "/syslinux/syslinux.cfg" "/boot/isolinux/isolinux.cfg" "/boot/syslinux/syslinux.cfg"; do if [ -f "${path}" ]; then syslinux_configfile -i ${path} @@ -52,7 +52,7 @@ menuentry 'Parse ISOLINUX menu (CD/DVD)' { insmod ata insmod iso9660 for x in (ata0) (ahci1); do - set root=$x + set root=${x} for path in "/isolinux/isolinux.cfg" "/syslinux/syslinux.cfg" "/boot/isolinux/isolinux.cfg" "/boot/syslinux/syslinux.cfg"; do if [ -f "${path}" ]; then syslinux_configfile -i ${path} @@ -72,8 +72,8 @@ menuentry 'Search for GRUB configuration (grub.cfg) outside of CBFS' { for x in (ahci0,1) (ahci0,2) (ahci0,3) (ahci0,4) (usb0) (usb0,1) (usb0,2) (usb0,3) (usb0,4); do for path in "/grub/grub.cfg" "/boot/grub/grub.cfg" "/grub2/grub.cfg" "/boot/grub2/grub.cfg"; do if [ -f "${x}${path}" ] ; then - submenu "Load Config from $x" $x { - root=$2 + submenu "Load Config from ${x}" ${x} { + root=${2} source ${path} unset superusers } |