From 7df9a4a974f8fdbc65571836d996fd1a077a9081 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 21 Mar 2019 10:19:36 +0100 Subject: [PATCH 1/1] zshenv: 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 --- etc/zsh/zshenv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv index d696b56..9a97788 100644 --- a/etc/zsh/zshenv +++ b/etc/zsh/zshenv @@ -51,8 +51,8 @@ fi # support extra scripts/software in special directory outside of squashfs environment in live mode if [[ -f /etc/grml_cd ]] ; then - [[ -r /lib/live/mount/medium/scripts ]] && ADDONS='/lib/live/mount/medium/scripts' - [[ -r /etc/grml/my_path ]] && ADDONS="$(cat /etc/grml/my_path)" + [[ -r /run/live/medium/scripts ]] && ADDONS='/run/live/medium/scripts' + [[ -r /etc/grml/my_path ]] && ADDONS="$(cat /etc/grml/my_path)" fi # Solaris -- 2.1.4