From f8757becb42b606ce0834a803e18a87f7c568fd5 Mon Sep 17 00:00:00 2001
From: Andreas Loibl <andreas@andreas-loibl.de>
Date: Sun, 11 Mar 2012 20:07:13 +0100
Subject: grub.cfg: check for 3rd partition before searching

---
 config/binary_grub/grub.cfg | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/config/binary_grub/grub.cfg b/config/binary_grub/grub.cfg
index 902c01e..52ae410 100644
--- a/config/binary_grub/grub.cfg
+++ b/config/binary_grub/grub.cfg
@@ -1,3 +1,4 @@
+echo Loading...
 set default=0
 set timeout=8
 
@@ -17,6 +18,7 @@ if loadfont /boot/grub/unicode.pf2 ; then
   insmod video_cirrus
   insmod gfxterm
   terminal_output gfxterm
+  echo Loading...
 fi
 
 insmod png
@@ -30,22 +32,24 @@ fi
 
 insmod part_msdos
 insmod btrfs
-if search --label --set liverw --no-floppy live-rw ; then
-  if test -e (${liverw})/grub.cmdline ; then
-    source (${liverw})/grub.cmdline
-    menuentry 'Start Kanotix (persistent)' --class kanotix64 --class gnu-linux --class gnu --class os {
-        echo    'Loading Linux ...'
-        linux   /live/vmlinuz ${persistent_cmdline}
-        echo    'Loading initial ramdisk ...'
-        initrd  /live/initrd.img
-    }
-  else
-    menuentry 'Start Kanotix (persistent)' --class kanotix64 --class gnu-linux --class gnu --class os {
-        echo    'Loading Linux ...'
-        linux   /live/vmlinuz ${boot_en} quiet splash persistent
-        echo    'Loading initial ramdisk ...'
-        initrd  /live/initrd.img
-    }
+if test -e ($root,msdos3) ; then
+  if search --label --set liverw --no-floppy live-rw ($root,msdos3) ; then
+    if test -e (${liverw})/grub.cmdline ; then
+      source (${liverw})/grub.cmdline
+      menuentry 'Start Kanotix (persistent)' --class kanotix64 --class gnu-linux --class gnu --class os {
+          echo    'Loading Linux ...'
+          linux   /live/vmlinuz ${persistent_cmdline}
+          echo    'Loading initial ramdisk ...'
+          initrd  /live/initrd.img
+      }
+    else
+      menuentry 'Start Kanotix (persistent)' --class kanotix64 --class gnu-linux --class gnu --class os {
+          echo    'Loading Linux ...'
+          linux   /live/vmlinuz ${boot_en} quiet splash persistent
+          echo    'Loading initial ramdisk ...'
+          initrd  /live/initrd.img
+      }
+    fi
   fi
 fi
 
-- 
cgit v1.0