# 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 | awk '{print $1}')"
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
+if [ -e "$MOUNT_POINT_" ]; 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_ $live_media_path_"
+grub_def_boot_args_="/vmlinuz $default_boot_args_ $live_media_path_"
# special boot arguments required by pxelinux
pxe_def_boot_args_="$default_boot_args_"
title GRML
root (nd)
kernel $grub_def_boot_args_ $def_fb_args_ $BOOT_ARGS_
- initrd /minirt26.gz
+ initrd /initrd.img
title GRML no framebuffer
root (nd)
title GRML small
root (nd)
kernel $grub_def_boot_args_ small $def_fb_args_ $BOOT_ARGS_
- initrd /minirt26.gz
+ initrd /initrd.img
title GRML small nofb
root (nd)
kernel $grub_def_boot_args_ small $no_fb_args_ $BOOT_ARGS_
- initrd /minirt26.gz
+ initrd /initrd.img
title GRML debuginit
root (nd)
kernel $grub_def_boot_args_ debuginitrd $def_fb_args_ $BOOT_ARGS_
- initrd /minirt26.gz
+ initrd /initrd.img
title GRML debuginit nofb
root (nd)
kernel $grub_def_boot_args_ debuginitrd $no_fb_args_ $BOOT_ARGS_
- initrd /minirt26.gz
+ initrd /initrd.img
title GRML rescue
root (nd)
kernel $grub_def_boot_args_ $no_fb_args_
- initrd /minirt26.gz
+ initrd /initrd.img
title memtest
root (nd)
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
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/' $config_files_
- sed -i -e 's/\(initrd\)=[[:alnum:]/._-]*/\1=minirt26.gz/' $config_files_
+ sed -i -e 's/.*kernel.*vmlinuz/ kernel vmlinuz/' $config_files_
+ sed -i -e 's/\(initrd\)=[[:alnum:]/._-]*/\1=initrd.img/' $config_files_
# remove live-media-path per default
sed -i -e 's#live-media-path=[[:alnum:]/._-]*##' $config_files_