From: Michael Prokop <mika@grml.org>
Date: Tue, 22 Jan 2013 14:32:36 +0000 (+0100)
Subject: Make sure we don't override live-media-path if /lib/live/mount/medium/boot exists
X-Git-Tag: v0.100.1~1
X-Git-Url: http://git.grml.org/?p=grml-terminalserver.git;a=commitdiff_plain;h=3bcb86f2636df4192e87e6b58609ad6da0afdf56

Make sure we don't override live-media-path if /lib/live/mount/medium/boot exists

Otherwise live_media_path points to the wrong configuration
in current Grml ISOs.
---

diff --git a/templates/grub-pxelinux_config b/templates/grub-pxelinux_config
index c3e99f1..d2fb6e9 100644
--- a/templates/grub-pxelinux_config
+++ b/templates/grub-pxelinux_config
@@ -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