From: Michael Prokop <mika@grml.org>
Date: Thu, 21 Mar 2019 08:33:02 +0000 (+0100)
Subject: Switch default mount point from /lib/live/mount/medium to /run/live/medium
X-Git-Tag: v0.102.0~5
X-Git-Url: http://git.grml.org/?p=grml-terminalserver.git;a=commitdiff_plain;h=2fee4ebd0301b9fcb88b3e4ad38db38fc245043a

Switch default mount point from /lib/live/mount/medium to /run/live/medium

In commit 0d878d3a679 of live-boot(-grml)
("Simplify mount point handling by using /run/live instead of /lib/live/mount")
the mountpath of /lib/live/mount/medium was moved towards /run/live/medium.

Commit c6a17c7b41b of live-boot(-grml) provides a backward compatibility
rbind mount, but occasionally there seems to be a regression somewhere
during boot (see https://github.com/grml/live-boot-grml/issues/10), and
the rbind mount will be deprecated and removed before the bullseye
(Debian 11) release.

Layout changes over time:

* /cdrom for old linuxrc approach
* /live/image for initramfs layout until December 2012
* /lib/live/mount/medium for initramfs layout since December 2012
* /run/live/medium for initramfs layout since December 2018

Drop support for everything but /run/live/medium and
/lib/live/mount/medium, while at it.
---

diff --git a/config b/config
index 31cf08b..e1abbca 100644
--- a/config
+++ b/config
@@ -7,19 +7,19 @@
 # grml-terminalserver AND grml-terminalserver-config
 
 # this is the path where the grml image/cdrom is placed (mounted)
-# default: /lib/live/mount/medium
+# default: /run/live/medium
 #MOUNT_POINT_=""
 
 # path + name of the memtest image
-# default: /lib/live/mount/medium/boot/addons/memtest
+# default: /run/live/medium/boot/addons/memtest
 #MEMTEST_IMAGE_=""
 
 # path to pxelinux boot message
-# default: /lib/live/mount/medium/boot/isolinux/boot.msg
+# default: /run/live/medium/boot/isolinux/boot.msg
 #PXE_BOOT_MSG_=""
 
 # path to pxelinux boot logo
-# default: /lib/live/mount/medium/boot/isolinux/logo.16
+# default: /run/live/medium/boot/isolinux/logo.16
 #PXE_BOOT_LOGO_=""
 
 # should the terminalserver activate snat for the clients to his default gateway?
diff --git a/default_config b/default_config
index e5e0863..5e1924d 100644
--- a/default_config
+++ b/default_config
@@ -2,12 +2,10 @@
 # !!! DO NOT EDIT THIS FILE !!!
 # /etc/grml/terminalserver/config is what you are searching for
 
-if [ -e /lib/live/mount/medium ] ; then
-  MOUNT_POINT_="/lib/live/mount/medium" # since around December 2012
-elif [ -e '/live/image' ]; then
-  MOUNT_POINT_="/live/image" # until around December 2012
-else
-  MOUNT_POINT_="/cdrom" # very old
+if [ -e /run/live/medium ] l then
+  MOUNT_POINT_='/run/live/medium' # since Dec. 2018
+elif [ -e /lib/live/mount/medium ] ; then
+  MOUNT_POINT_="/lib/live/mount/medium"
 fi
 
 # assume we have a grml2usb system
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.