From f4d6726311705a123c8e2f9a7e736bd253c3dee4 Mon Sep 17 00:00:00 2001
From: Andreas Loibl <andreas@andreas-loibl.de>
Date: Sun, 20 May 2012 22:00:08 +0200
Subject: grub.cfg: support for 2in1 persistent

---
 config/binary_grub/grub.cfg | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/config/binary_grub/grub.cfg b/config/binary_grub/grub.cfg
index 0a5d6df..9aba770 100644
--- a/config/binary_grub/grub.cfg
+++ b/config/binary_grub/grub.cfg
@@ -32,21 +32,26 @@ fi
 
 insmod part_msdos
 insmod btrfs
+set persistent=0
 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
-      }
+      set persistent=1
     fi
   fi
 fi
 
 #####
+if [ $persistent = 1 ] ; then
+  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
+  }
+fi
+
 menuentry 'Start Kanotix DE' --class kanotix64 --class gnu-linux --class gnu --class os {
         echo    'Loading Linux ...'
         linux   /live/vmlinuz ${boot_de} quiet splash
-- 
cgit v1.0