summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Loibl <andreas@andreas-loibl.de>2012-05-22 01:40:45 +0200
committerAndreas Loibl <andreas@andreas-loibl.de>2012-05-22 01:40:45 +0200
commit872892b019ee276291a32279b29c1f1b4d904980 (patch)
tree76e7e5174597e11aff745cf673d9479f78d38c8e
parent1d5b6a80fa170fcbded45c1fd12edc6506dd3d57 (diff)
downloadkanotix-872892b019ee276291a32279b29c1f1b4d904980.zip
kanotix-872892b019ee276291a32279b29c1f1b4d904980.tar.gz
restore live-media-path from persistent cmdline
-rw-r--r--config/binary_grub/grub.cfg20
1 files changed, 10 insertions, 10 deletions
diff --git a/config/binary_grub/grub.cfg b/config/binary_grub/grub.cfg
index 1897c6b..10cf2c8 100644
--- a/config/binary_grub/grub.cfg
+++ b/config/binary_grub/grub.cfg
@@ -37,21 +37,21 @@ 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
- set persistent=1
+ insmod regexp
+ 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 {
+ echo 'Loading Linux ...'
+ linux /$lmp/vmlinuz ${persistent_cmdline}
+ echo 'Loading initial ramdisk ...'
+ initrd /$lmp/initrd.img
+ }
+ fi
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