From 196ae33323d65c7de6d45d5ab333298d5e21ebe8 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Tue, 22 Sep 2015 13:02:48 +0100
Subject: grub.cfg: RAID support (2)

---
 resources/grub/config/menuentries/common.cfg | 35 +++++++++++++---------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'resources/grub')

diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index 8e14c3b7..ec2def32 100644
--- a/resources/grub/config/menuentries/common.cfg
+++ b/resources/grub/config/menuentries/common.cfg
@@ -30,27 +30,24 @@ menuentry 'Load Operating System' {
 		done
 	done
 
-# Last resort, otherwise go to GRUB shell
-	for devname in "md/0" "ahci0"; do
-		case ${devname} in
-			ahci0)
-				rootdev="/dev/sda1"
-				set root='ahci0,1'
-				;;
-			*)
-				rootdev="/dev/md0"
-				set root='md/0'
-				;;
-		esac
+	set root='md/0'
+	for p in "/" "/boot/"; do
+		if [ -f "${p}vmlinuz" ] ; then
+			linux ${p}vmlinuz root=/dev/md0 rw
+			if [ -f "${p}initrd.img" ] ; then
+				initrd ${p}initrd.img
+			fi
+		fi
+	done
 
-		for p in "/" "/boot/"; do
-			if [ -f "${p}vmlinuz" ] ; then
-				linux ${p}vmlinuz root=${rootdev} rw
-				if [ -f "${p}initrd.img" ] ; then
-					initrd ${p}initrd.img
-				fi
+	set root='ahci0,1'
+	for p in "/" "/boot/"; do
+		if [ -f "${p}vmlinuz" ] ; then
+			linux ${p}vmlinuz root=/dev/sda1 rw
+			if [ -f "${p}initrd.img" ] ; then
+				initrd ${p}initrd.img
 			fi
-		done
+		fi
 	done
 }
 menuentry 'Parse ISOLINUX menu (SATA)' {
-- 
cgit v1.2.3-70-g09d2