X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=templates%2Fgrub-pxelinux_config;h=8360ac33910b16a316f8f9f17d2fcf17e01ef069;hb=9e03d19b739385e0d310125052ce62488c3f5458;hp=069c7562db10dd60287b0d6b5a54361c816f0d6c;hpb=a843783f475767ce244325eca06296c189d5b2da;p=grml-terminalserver.git

diff --git a/templates/grub-pxelinux_config b/templates/grub-pxelinux_config
index 069c756..8360ac3 100644
--- a/templates/grub-pxelinux_config
+++ b/templates/grub-pxelinux_config
@@ -17,13 +17,6 @@
 #
 # 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 | 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 "$MOUNT_POINT_" ]; then
     default_boot_args_="root=/dev/nfs rw nfsroot=$IP_:$MOUNT_POINT_ \
@@ -34,93 +27,34 @@ init=/etc/init nfsdir=$IP_:$MOUNT_POINT_ nodhcp noprompt noeject \
 apm=power-off nomce"
 fi
 
-# special boot arguments required by grub
-grub_def_boot_args_="/vmlinuz $default_boot_args_ $live_media_path_"
-
 # special boot arguments required by pxelinux
 pxe_def_boot_args_="$default_boot_args_"
 
-# default arguments for framebuffer console
-def_fb_args_="vga=791"
-no_fb_args_="vga=normal"
-
-###
-## create grub config
-###
-
-cat >"$TFTPD_DATA_DIR_/menu.lst" <<EOT
-default=0
-timeout=10
-title GRML
-  root (nd)
-  kernel $grub_def_boot_args_ $def_fb_args_ $BOOT_ARGS_
-  initrd /initrd.img
-
-title GRML no framebuffer
-  root (nd)
-  kernel $grub_def_boot_args_ $no_fb_args_ $BOOT_ARGS_
-
-title GRML small
-  root (nd)
-  kernel $grub_def_boot_args_ small $def_fb_args_ $BOOT_ARGS_
-  initrd /initrd.img
-
-title GRML small nofb
-  root (nd)
-  kernel $grub_def_boot_args_ small $no_fb_args_ $BOOT_ARGS_
-  initrd /initrd.img
-
-title GRML debuginit
-  root (nd)
-  kernel $grub_def_boot_args_ debuginitrd $def_fb_args_ $BOOT_ARGS_
-  initrd /initrd.img
-
-title GRML debuginit nofb
-  root (nd)
-  kernel $grub_def_boot_args_ debuginitrd $no_fb_args_ $BOOT_ARGS_
-  initrd /initrd.img
-
-title GRML rescue
-  root (nd)
-  kernel $grub_def_boot_args_ $no_fb_args_
-  initrd /initrd.img
-
-title memtest
-  root (nd)
-  kernel /memtest
-
-title Reload config
-  configfile (nd)/menu.lst
-EOT
-
-ret_=$?
-
-
 ###
 ## 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.
 
@@ -160,9 +94,10 @@ fi
 # Copy initrd.img and vmlinuz from all directories which name begins
 # with grml, e.g. grml32full and grml64full
 # This way we can boot multiple ISOs
-for filename in $(ls -d ${MULTIBOOT_PATH_}/grml*); do
-  cp -r ${filename} ${TFTPD_DATA_DIR_}/boot/
-done 
+for filename in "${MULTIBOOT_PATH_}"/grml* ; do
+  [ -d "$filename" ] || continue
+  cp -r "${filename}" "${TFTPD_DATA_DIR_}/boot/"
+done
 
 config_files_=$(find "$TFTPD_DATA_DIR_/" -name "*.cfg" -type f)
 
@@ -172,7 +107,9 @@ if [ -d "$MOUNT_POINT_"/boot/release ] ; then
 fi
 
 # adjust ldbsd.com bootline
-sed -i -e 's#\(.*kernel .*/ldbsd.com\)#\1 set image /boot/addons/bsd4grml/bsd.rd`echo Type "boot" to load MirOS bsd4grml via keeppxe#' "$TFTPD_DATA_DIR_/"addon_*_bsd.cfg
+if ls "$TFTPD_DATA_DIR_/"addon_*_bsd.cfg >/dev/null 2>&1; then
+  sed -i -e 's#\(.*kernel .*/ldbsd.com\)#\1 set image /boot/addons/bsd4grml/bsd.rd`echo Type "boot" to load MirOS bsd4grml via keeppxe#' "$TFTPD_DATA_DIR_/"addon_*_bsd.cfg
+fi
 
 # remove grub entries
 rm -f "$TFTPD_DATA_DIR_/"addon_*grub*.cfg