X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=templates%2Fgrub-pxelinux_config;fp=templates%2Fgrub-pxelinux_config;h=50fc1bdd1f0b787b9e7baa9746b2a630d3563448;hb=2fee4ebd0301b9fcb88b3e4ad38db38fc245043a;hp=ba1f2f4d39be1be6fd51c89469eecf2b80000164;hpb=508a5ea5125f39c915035dcb407b4bbf6f248eef;p=grml-terminalserver.git diff --git a/templates/grub-pxelinux_config b/templates/grub-pxelinux_config index ba1f2f4..50fc1bd 100644 --- a/templates/grub-pxelinux_config +++ b/templates/grub-pxelinux_config @@ -34,27 +34,27 @@ pxe_def_boot_args_="$default_boot_args_" ## create pxelinux config ### DEST_DIR=$(mktemp -d) -if [ -d /lib/live/mount/medium/boot ] ; then # since around December 2012 +if [ -d /run/live/medium ] ; then # since December 2018 grml2usb --bootloader-only \ --bootoptions="$pxe_def_boot_args_ $BOOT_ARGS_" \ --remove-bootoption=nodhcp \ - /lib/live/mount/medium "$DEST_DIR" + /run/live/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 +elif [ -d /lib/live/mount/medium ] ; then grml2usb --bootloader-only \ --bootoptions="$pxe_def_boot_args_ $BOOT_ARGS_" \ --remove-bootoption=nodhcp \ - /live/image "$DEST_DIR" + /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_" -else # there is no kernel inside /live/image copy it from /boot +else if [ ! -d /usr/share/grml-live/templates/boot/isolinux ] ; then echo "E: Could not find isolinux directory, can not operate without.