Switch default mount point from /lib/live/mount/medium to /run/live/medium
authorMichael Prokop <mika@grml.org>
Thu, 21 Mar 2019 09:02:32 +0000 (10:02 +0100)
committerMichael Prokop <mika@grml.org>
Thu, 21 Mar 2019 09:08:45 +0000 (10:08 +0100)
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: 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.

grml-x

diff --git a/grml-x b/grml-x
index 97eec09..89c853b 100755 (executable)
--- a/grml-x
+++ b/grml-x
@@ -69,9 +69,8 @@ def build_bootparams():
     f = open('/proc/cmdline')
     lines.append(f.readline())
     f.close()
-    walk_bootparams_path('/cdrom/bootparams')
-    walk_bootparams_path('/live/image/bootparams')
     walk_bootparams_path('/lib/live/mount/medium/bootparams')
+    walk_bootparams_path('/run/live/medium/bootparams')
     params = {}
     for p in ' '.join(lines).split(' '):
         if '=' in p: