projects
/
grml-terminalserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch default mount point from /lib/live/mount/medium to /run/live/medium
[grml-terminalserver.git]
/
templates
/
grub-pxelinux_config
diff --git
a/templates/grub-pxelinux_config
b/templates/grub-pxelinux_config
index
ba1f2f4
..
50fc1bd
100644
(file)
--- 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)
## 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 \
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_"
mv "$DEST_DIR"/boot/syslinux/* "$TFTPD_DATA_DIR_/"
rmdir "$DEST_DIR"/boot/syslinux
mv "$DEST_DIR"/boot/ "$TFTPD_DATA_DIR_"
-elif [ -d /li
ve/image/boot ] ; then # until around December 2012
+elif [ -d /li
b/live/mount/medium ] ; then
grml2usb --bootloader-only \
--bootoptions="$pxe_def_boot_args_ $BOOT_ARGS_" \
--remove-bootoption=nodhcp \
grml2usb --bootloader-only \
--bootoptions="$pxe_def_boot_args_ $BOOT_ARGS_" \
--remove-bootoption=nodhcp \
- /li
ve/image
"$DEST_DIR"
+ /li
b/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_"
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.
if [ ! -d /usr/share/grml-live/templates/boot/isolinux ] ; then
echo "E: Could not find isolinux directory, can not operate without.