X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=templates%2Fgrub-pxelinux_config;h=50fc1bdd1f0b787b9e7baa9746b2a630d3563448;hb=2fee4ebd0301b9fcb88b3e4ad38db38fc245043a;hp=7354970a217c51fb2e0fb6e0433e751f4d7e3c96;hpb=162ecbe01f6e8c085bb5e9b6f0bdbe2d27e659aa;p=grml-terminalserver.git

diff --git a/templates/grub-pxelinux_config b/templates/grub-pxelinux_config
index 7354970..50fc1bd 100644
--- a/templates/grub-pxelinux_config
+++ b/templates/grub-pxelinux_config
@@ -17,97 +17,50 @@
 #
 # 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)"
-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 \
 apm=power-off nomce"
 fi
 
-# special boot arguments required by grub
-grub_def_boot_args_="/linux26 $default_boot_args_"
-
 # 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 /minirt26.gz
-
-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 /minirt26.gz
-
-title GRML small nofb
-  root (nd)
-  kernel $grub_def_boot_args_ small $no_fb_args_ $BOOT_ARGS_
-  initrd /minirt26.gz
-
-title GRML debuginit
-  root (nd)
-  kernel $grub_def_boot_args_ debuginitrd $def_fb_args_ $BOOT_ARGS_
-  initrd /minirt26.gz
-
-title GRML debuginit nofb
-  root (nd)
-  kernel $grub_def_boot_args_ debuginitrd $no_fb_args_ $BOOT_ARGS_
-  initrd /minirt26.gz
-
-title GRML rescue
-  root (nd)
-  kernel $grub_def_boot_args_ $no_fb_args_
-  initrd /minirt26.gz
-
-title memtest
-  root (nd)
-  kernel /memtest
-
-title Reload config
-  configfile (nd)/menu.lst
-EOT
-
-ret_=$?
-
-
 ###
 ## create pxelinux config
 ###
 DEST_DIR=$(mktemp -d)
-if [ -d /live/image/boot ] ; then
+if [ -d /run/live/medium ] ; then # since December 2018
   grml2usb --bootloader-only \
-      --bootoptions="$pxe_def_boot_args_ $BOOT_ARGS_" /live/image "$DEST_DIR"
+      --bootoptions="$pxe_def_boot_args_ $BOOT_ARGS_" \
+      --remove-bootoption=nodhcp \
+      /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_"
-else # there is no kernel inside /live/image copy it from /boot
+elif [ -d /lib/live/mount/medium ] ; then
+  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_"
+else
   if [ ! -d /usr/share/grml-live/templates/boot/isolinux ] ; then
-    echo "E: Could not find isolinux template directory" >&2
+    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
 
@@ -138,25 +91,21 @@ EOT
 
 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 "${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)
 
 # cd is multi iso, grml2usb got it right ;0
 if [ -d "$MOUNT_POINT_"/boot/release ] ; then
    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_
-
-  # 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_'#' $config_files_
-  else
-    sed -i -e 's#live-media-path=[[:alnum:]/._-]*##' $config_files_
-  fi
-
 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