From 34819b81d79e260d1fca486316806bc1b2e33896 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 21 Mar 2019 10:12:56 +0100 Subject: [PATCH] grml2ram: 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. --- usr_sbin/grml2ram | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/usr_sbin/grml2ram b/usr_sbin/grml2ram index 37c36a3..3482bdb 100755 --- a/usr_sbin/grml2ram +++ b/usr_sbin/grml2ram @@ -19,12 +19,10 @@ if ! isgrmlcd ; then exit 1 fi -# old linuxrc version: -[ -d /cdrom ] && export LIVECD_PATH=/cdrom -# initramfs layout until around December 2012: -[ -d /live/image ] && export LIVECD_PATH=/live/image -# initramfs layout since around December 2012: -[ -d /lib/live/mount/medium ] && export LIVECD_PATH=/lib/live/mount/medium +# initramfs layout since December 2012, backwards compatibility: +[ -d /lib/live/mount/medium ] && export LIVECD_PATH='/lib/live/mount/medium' +# initramfs layout since December 2018: +[ -d /run/live/medium ] && export LIVECD_PATH='/run/live/medium' if [ -z "$CMDLINE" ]; then # if CMDLINE was set from the outside, we're debugging. -- 2.1.4