# 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)"
+ live_media_path_="live-media-path=$(awk -F live-media-path= '{print $2}' /proc/cmdline)"
+fi
+if [ ! -d /live/image/boot ] ; then
+ live_media_path_="live-media-path=/"
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_ \
-nodhcp noprompt noeject"
+noprompt noeject"
else
default_boot_args_="ramdisk_size=24000 root=/dev/ram0 rw \
init=/etc/init nfsdir=$IP_:$MOUNT_POINT_ nodhcp noprompt noeject \
fi
# special boot arguments required by grub
-grub_def_boot_args_="/linux26 $default_boot_args_"
+grub_def_boot_args_="/linux26 $default_boot_args_ $live_media_path_"
# special boot arguments required by pxelinux
pxe_def_boot_args_="$default_boot_args_"
DEST_DIR=$(mktemp -d)
if [ -d /live/image/boot ] ; then
grml2usb --bootloader-only \
- --bootoptions="$pxe_def_boot_args_ $BOOT_ARGS_" /live/image "$DEST_DIR"
+ --bootoptions="$pxe_def_boot_args_ $BOOT_ARGS_" \
+ --remove-bootoption=nodhcp \
+ /live/image "$DEST_DIR"
mv "$DEST_DIR"/boot/syslinux/* "$TFTPD_DATA_DIR_/"
rmdir "$DEST_DIR"/boot/syslinux
fi
+config_files_=$(find "$TFTPD_DATA_DIR_/" -name "*.cfg" -type f)
# cd is multi iso, grml2usb got it right ;0
if [ -d "$MOUNT_POINT_"/boot/release ] ; then
- sed -i -e 's#\(.*\)/boot/\(.*\)#\1\2#' "$TFTPD_DATA_DIR_/"*.cfg 2>/dev/null
+ sed -i -e 's#\(.*\)/boot/\(.*\)#\1\2#' $config_files_
else
- # remove normal kernel path and use our image
- sed -i -e 's/.*kernel.*linux26/kernel linux26/' "$TFTPD_DATA_DIR_/"*.cfg 2>/dev/null
- sed -i -e 's/\(initrd\)=[[:alnum:]/._-]*/\1=minirt26.gz/' "$TFTPD_DATA_DIR_/"*.cfg 2>/dev/null
-
- # only append live-media-path if needed
- if [ ! -z "$live_media_path_" ] ; then
- sed -i -e 's/\(live-media-path\)=[[:alnum:]/._-]*/\1='$live_media_path_'/' "$TFTPD_DATA_DIR_/"*.cfg 2>/dev/null
- else
- sed -i -e 's/live-media-path=[[:alnum:]/._-]*//' "$TFTPD_DATA_DIR_/"*.cfg 2>/dev/nul
- fi
+ # remove normal kernel path and use our image
+ sed -i -e 's/.*kernel.*linux26/kernel linux26/' $config_files_
+ sed -i -e 's/\(initrd\)=[[:alnum:]/._-]*/\1=minirt26.gz/' $config_files_
+ # remove live-media-path per default
+ sed -i -e 's#live-media-path=[[:alnum:]/._-]*##' $config_files_
+
+ # append live-media-path if needed
+ if [ ! -z "$live_media_path_" ] ; then
+ sed -i -e "s#\(^.*append.*initrd.*$\)#\1 $live_media_path_#" $config_files_
+ fi
fi
# adjust ldbsd.com bootline