X-Git-Url: https://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2Fgrub-pxelinux_config;fp=templates%2Fgrub-pxelinux_config;h=b41e7b03d00426ada05c97b826c0be3af5d29160;hb=cfab1646f2a34b52de5fd4afaddf97f71e7fab70;hp=d224569041a2426b972b6821fc6a8e16d09de95a;hpb=295888a08ac807c45a142e63394300842e7fdfcb;p=grml-terminalserver.git

diff --git a/templates/grub-pxelinux_config b/templates/grub-pxelinux_config
index d224569..b41e7b0 100644
--- a/templates/grub-pxelinux_config
+++ b/templates/grub-pxelinux_config
@@ -17,15 +17,18 @@
 #
 # GLOBAL_README_END
 
+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)"
+fi
 
 # default boot arguments used for both grub and pxelinux
 if [ -e '/live/cow' ]; then
     default_boot_args_="root=/dev/nfs rw nfsroot=$IP_:$MOUNT_POINT_ \
-boot=live lang=us nomce quiet apm=power-off nodhcp noprompt noeject"
+boot=live $live_media_path_ nomce quiet apm=power-off nodhcp noprompt noeject"
 else
     default_boot_args_="ramdisk_size=24000 root=/dev/ram0 rw \
 init=/etc/init nfsdir=$IP_:$MOUNT_POINT_ nodhcp noprompt noeject \
-apm=power-off nomce lang=us"
+apm=power-off nomce"
 fi
 
 # special boot arguments required by grub