From 4e36e3bd4e3bafd45bf95bd4da095dcb126a274f Mon Sep 17 00:00:00 2001
From: Andreas Loibl <andreas@andreas-loibl.de>
Date: Tue, 22 May 2012 01:49:11 +0200
Subject: regexp fix, removed menuentry --class options

---
 config/binary_grub/grub.cfg | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/config/binary_grub/grub.cfg b/config/binary_grub/grub.cfg
index 10cf2c8..edd3cf9 100644
--- a/config/binary_grub/grub.cfg
+++ b/config/binary_grub/grub.cfg
@@ -38,9 +38,10 @@ if test -e ($root,msdos3) ; then
     if test -e (${liverw})/grub.cmdline ; then
       source (${liverw})/grub.cmdline
       insmod regexp
-      regexp --set=lmp 'live-media-path=\(.*\) )' "${persistent_cmdline}"
+      set lmp=live
+      regexp --set=lmp 'live-media-path=\([^ ]*\)' "${persistent_cmdline}"
       if test -d /$lmp ; then
-        menuentry 'Start Kanotix (persistent)' --class kanotix64 --class gnu-linux --class gnu --class os {
+        menuentry 'Start Kanotix (persistent)' {
     	echo    'Loading Linux ...'
     	linux   /$lmp/vmlinuz ${persistent_cmdline}
     	echo    'Loading initial ramdisk ...'
@@ -52,7 +53,7 @@ if test -e ($root,msdos3) ; then
 fi
 
 #####
-menuentry 'Start Kanotix DE' --class kanotix64 --class gnu-linux --class gnu --class os {
+menuentry 'Start Kanotix DE' {
         echo    'Loading Linux ...'
         linux   /live/vmlinuz ${boot_de} quiet splash
         echo    'Loading initial ramdisk ...'
@@ -60,7 +61,7 @@ menuentry 'Start Kanotix DE' --class kanotix64 --class gnu-linux --class gnu --c
 }
 
 if test -d /gfxoverlay ; then
-  menuentry 'Start Kanotix DE (gfxoverlay)' --class kanotix64 --class gnu-linux --class gnu --class os {
+  menuentry 'Start Kanotix DE (gfxoverlay)' {
         echo    'Loading Linux ...'
         linux   /live/vmlinuz ${boot_de} gfx=auto quiet splash
         echo    'Loading initial ramdisk ...'
@@ -68,7 +69,7 @@ if test -d /gfxoverlay ; then
   }
 fi
 
-menuentry 'Start Kanotix EN' --class kanotix64 --class gnu-linux --class gnu --class os {
+menuentry 'Start Kanotix EN' {
         echo    'Loading Linux ...'
         linux   /live/vmlinuz ${boot_en} quiet splash
         echo    'Loading initial ramdisk ...'
@@ -76,7 +77,7 @@ menuentry 'Start Kanotix EN' --class kanotix64 --class gnu-linux --class gnu --c
 }
 
 if test -d /gfxoverlay ; then
-  menuentry 'Start Kanotix EN (gfxoverlay)' --class kanotix64 --class gnu-linux --class gnu --class os {
+  menuentry 'Start Kanotix EN (gfxoverlay)' {
         echo    'Loading Linux ...'
         linux   /live/vmlinuz ${boot_en} gfx=auto quiet splash
         echo    'Loading initial ramdisk ...'
@@ -84,7 +85,7 @@ if test -d /gfxoverlay ; then
   }
 fi
 
-menuentry 'Start Kanotix DE (failsafe)' --class kanotix64 --class gnu-linux --class gnu --class os {
+menuentry 'Start Kanotix DE (failsafe)' {
         echo    'Loading Linux ...'
         linux   /live/vmlinuz ${boot_de} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal
         echo    'Loading initial ramdisk ...'
@@ -92,7 +93,7 @@ menuentry 'Start Kanotix DE (failsafe)' --class kanotix64 --class gnu-linux --cl
 }
 
 
-menuentry 'Start Kanotix EN (failsafe)' --class kanotix64 --class gnu-linux --class gnu --class os {
+menuentry 'Start Kanotix EN (failsafe)' {
         echo    'Loading Linux ...'
         linux   /live/vmlinuz ${boot_en} quiet splash noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal
         echo    'Loading initial ramdisk ...'
@@ -123,7 +124,7 @@ if [ "$grub_platform" == "efi" ]; then
    fi
   done
 else
-  menuentry 'Memtest86+' --class memtest {
+  menuentry 'Memtest86+' {
         linux16 /live/memtest
   }
 fi
-- 
cgit v1.0