Make sure we don't override live-media-path if /lib/live/mount/medium/boot exists
authorMichael Prokop <mika@grml.org>
Tue, 22 Jan 2013 14:32:36 +0000 (15:32 +0100)
committerMichael Prokop <mika@grml.org>
Tue, 22 Jan 2013 14:32:36 +0000 (15:32 +0100)
Otherwise live_media_path points to the wrong configuration
in current Grml ISOs.

templates/grub-pxelinux_config

index c3e99f1..d2fb6e9 100644 (file)
@@ -20,7 +20,7 @@
 if grep -q live-media-path= /proc/cmdline 2>/dev/null ; then
   live_media_path_="live-media-path=$(awk -F live-media-path= '{print $2}' /proc/cmdline | awk '{print $1}')"
 fi
-if [ ! -d /live/image/boot ] ; then
+if [ ! -d /live/image/boot ] && [ ! -d /lib/live/mount/medium/boot ] ; then
   live_media_path_="live-media-path=/"
 fi