From 70a5830a7eecd127582e52b1c52b6d4f111e003d Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 21 Mar 2019 10:08:25 +0100 Subject: [PATCH] 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. --- remaster/grml-live-remaster | 10 +++++----- templates/GRML/grml-cheatcodes.txt | 2 +- templates/boot/isolinux/f3 | 2 +- templates/boot/isolinux/f5 | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/remaster/grml-live-remaster b/remaster/grml-live-remaster index d4eb695..326a189 100755 --- a/remaster/grml-live-remaster +++ b/remaster/grml-live-remaster @@ -21,15 +21,15 @@ fi set -e # exit on any error -if [ -d /live/image/boot/ ] ; then # until Grml versions <=2012.XX - LIVE_PATH_MAIN='/live/image' - LIVE_PATH_BOOT='/live/image/boot/' -else # for Grml versions >=2013.XX +if [ -d /run/live/medium/ ] ; then # since Dec 2018 + LIVE_PATH_MAIN='/run/live/medium/' + LIVE_PATH_BOOT='/run/live/medium/boot/' +else # until Dec 2018 LIVE_PATH_MAIN='/lib/live/mount/medium/' LIVE_PATH_BOOT='/lib/live/mount/medium/boot/' fi -VERSION='0.0.3' +VERSION='0.0.4' GRML_LIVE_EDITOR=${VISUAL:-${EDITOR:-vi}} # source core functions {{{ diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt index dff83a9..1f7080e 100644 --- a/templates/GRML/grml-cheatcodes.txt +++ b/templates/GRML/grml-cheatcodes.txt @@ -108,7 +108,7 @@ grml tohd=/dev/sda1 Copy Grml's squashfs file to harddisk partit use via "grml bootfrom=/dev/sda1" grml bootfrom=/dev/sda1 Use the squashfs file from directory 'live' of the specified device Setup can be done booting 'grml tohd=/dev/sda1' or - running 'rsync -a --progress /lib/live/mount/medium/live /media/sda1/' + running 'rsync -a --progress /run/live/medium/live /media/sda1/' grml bootfrom=removable Restrict search for the live media to removable type only. grml bootfrom=removable-usb Restrict search for the live media to usb mass storage only. grml isofrom=/dev/sda1/grml.iso Use specified ISO image for booting diff --git a/templates/boot/isolinux/f3 b/templates/boot/isolinux/f3 index 6c130f4..a772302 100644 --- a/templates/boot/isolinux/f3 +++ b/templates/boot/isolinux/f3 @@ -17,6 +17,6 @@ A list with all supported boot options can be found on the CD at - /lib/live/mount/medium/GRML/*/grml-cheatcodes.txt + /run/live/medium/grml/*/grml-cheatcodes.txt 1f diff --git a/templates/boot/isolinux/f5 b/templates/boot/isolinux/f5 index c4a4194..46abd51 100644 --- a/templates/boot/isolinux/f5 +++ b/templates/boot/isolinux/f5 @@ -16,6 +16,6 @@ to RAM and run from there grml vga=ask / vga=791 prompt for framebuffer menu / set options - Supported boot options: /lib/live/mount/medium/GRML/*/grml-cheatcodes.txt + Supported boot options: /run/live/medium/grml/*/grml-cheatcodes.txt 1f -- 2.1.4