X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=templates%2Fgrub-pxelinux_config;h=d2fb6e9c79053bf3e2a2c90d24249783235d497b;hb=3bcb86f2636df4192e87e6b58609ad6da0afdf56;hp=6e0dc4016dcbc8444769f9fe551378e0c30b166d;hpb=fafcc8fbdff4f9052067984cd846453169a9d24d;p=grml-terminalserver.git diff --git a/templates/grub-pxelinux_config b/templates/grub-pxelinux_config index 6e0dc40..d2fb6e9 100644 --- a/templates/grub-pxelinux_config +++ b/templates/grub-pxelinux_config @@ -18,13 +18,16 @@ # 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 ] && [ ! -d /lib/live/mount/medium/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 \ @@ -32,7 +35,7 @@ apm=power-off nomce" fi # special boot arguments required by grub -grub_def_boot_args_="/linux26 $default_boot_args_" +grub_def_boot_args_="/vmlinuz $default_boot_args_ $live_media_path_" # special boot arguments required by pxelinux pxe_def_boot_args_="$default_boot_args_" @@ -51,7 +54,7 @@ timeout=10 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) @@ -60,27 +63,27 @@ title GRML no framebuffer 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) @@ -97,29 +100,80 @@ ret_=$? ## create pxelinux config ### DEST_DIR=$(mktemp -d) -grml2usb --bootloader-only \ - --bootoptions="$pxe_def_boot_args_ $BOOT_ARGS_" /live/image "$DEST_DIR" +if [ -d /lib/live/mount/medium/boot ] ; then # since around December 2012 + grml2usb --bootloader-only \ + --bootoptions="$pxe_def_boot_args_ $BOOT_ARGS_" \ + --remove-bootoption=nodhcp \ + /lib/live/mount/medium "$DEST_DIR" + + mv "$DEST_DIR"/boot/syslinux/* "$TFTPD_DATA_DIR_/" + rmdir "$DEST_DIR"/boot/syslinux + + mv "$DEST_DIR"/boot/ "$TFTPD_DATA_DIR_" +elif [ -d /live/image/boot ] ; then # until around December 2012 + grml2usb --bootloader-only \ + --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 + + mv "$DEST_DIR"/boot/ "$TFTPD_DATA_DIR_" +else # there is no kernel inside /live/image copy it from /boot + if [ ! -d /usr/share/grml-live/templates/boot/isolinux ] ; then + echo "E: Could not find isolinux directory, can not operate without. + +Did you boot the system with the toram=... boot option? If so please +either do not use the toram boot option at all or use boot option toram +without any arguments (just \"toram\" instead of \"toram=...\")." >&2 + exit 2 + fi + + array=( $(cat /etc/grml_version) ) + grml_name_=${array[0]} + grml_version_=${array[1]} + + cp /usr/share/grml-live/templates/boot/isolinux/* "$TFTPD_DATA_DIR_/" + + config_files_=$(find "$TFTPD_DATA_DIR_/" -name "*.cfg" -type f) + sed -i "s/%ARCH%/$(uname -m)/" $config_files_ + sed -i "s/%BOOTID%/$RANDOM/" $config_files_ + sed -i "s/%SHORT_NAME%/dummy/" $config_files_ + sed -i "s/%VERSION%/$grml_version_/" $config_files_ + sed -i "s/%GRML_NAME%/$grml_name_/" $config_files_ + sed -i "s/%DISTRI_SPLASH%/grml.png/" $config_files_ + sed -i "s/%DISTRI_INFO%/Grml/" $config_files_ + sed -i "s#\(^.*append.*initrd.*$\)#\1 $pxe_def_boot_args_ $BOOT_ARGS_#" $config_files_ + cat > "$TFTPD_DATA_DIR_/grmlmain.cfg"</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.*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_ + + # 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