From 9ae80494f13a64d6ebaff2f34048b49c45973f03 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Tue, 18 Aug 2015 17:35:57 -0400
Subject: grub.cfg: refer to variables properly

---
(limited to 'resources/grub/config')

diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index 3e66425..b153484 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
 				}
--
cgit v0.9.1