Bug#1107389: live-config: Configs in Trixie live media have no effect
My initial patch fails to address the problem for hooks and preseeds.
I also forgot to update the manpage. Patch revised and attached.
Again, if /lib/live/mount is no longer used at all, I assume it can be
removed from live-config completely (either now or later), but I have
retained it in the patch for now since I am not sure.
diff --git a/components/0010-debconf b/components/0010-debconf
index 8e1cf03..8e60438 100755
--- a/components/0010-debconf
+++ b/components/0010-debconf
@@ -60,6 +60,9 @@ Config ()
if ls /lib/live/mount/medium/live/config-preseed/* 2>&1
then
_PRESEEDS="${_PRESEEDS} $(for _FILE in /lib/live/mount/medium/live/config-preseed/*; do echo file://${_FILE}; done)"
+ elif ls /run/live/medium/live/config-preseed/* 2>&1
+ then
+ _PRESEEDS="${_PRESEEDS} $(for _FILE in /run/live/medium/live/config-preseed/*; do echo file://${_FILE}; done)"
fi
;;
diff --git a/components/9990-hooks b/components/9990-hooks
index 5b92779..cfff182 100755
--- a/components/9990-hooks
+++ b/components/9990-hooks
@@ -53,6 +53,9 @@ Config ()
if ls /lib/live/mount/medium/live/config-hooks/* 2>&1
then
_HOOKS="${_HOOKS} $(for _FILE in /lib/live/mount/medium/live/config-hooks/*; do echo file://${_FILE}; done)"
+ elif ls /run/live/medium/live/config-hooks/* 2>&1
+ then
+ _HOOKS="${_HOOKS} $(for _FILE in /run/live/medium/live/config-hooks/*; do echo file://${_FILE}; done)"
fi
;;
diff --git a/frontend/init-config.sh b/frontend/init-config.sh
index 88536e1..b4f8358 100755
--- a/frontend/init-config.sh
+++ b/frontend/init-config.sh
@@ -11,7 +11,9 @@ export LIVE_HOSTNAME LIVE_USERNAME LIVE_USER_FULLNAME LIVE_USER_DEFAULT_GROUPS
set -o allexport
for _FILE in /etc/live/config.conf /etc/live/config.conf.d/*.conf \
/lib/live/mount/medium/live/config.conf /lib/live/mount/medium/live/config.conf.d/*.conf \
- /lib/live/mount/persistence/*/live/config.conf /lib/live/mount/persistence/*/live/config.conf.d/*.conf
+ /lib/live/mount/persistence/*/live/config.conf /lib/live/mount/persistence/*/live/config.conf.d/*.conf \
+ /run/live/medium/live/config.conf /run/live/medium/live/config.conf.d/*.conf \
+ /run/live/persistence/*/live/config.conf /run/live/persistence/*/live/config.conf.d/*.conf
do
if [ -e "${_FILE}" ]
then
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index c387ece..efe0ab0 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -38,7 +38,7 @@ Some individual components can change their behaviour upon a boot parameter.
.IP "\fBlive\-config.debconf\-preseed\fR=filesystem|medium|\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR | \fBdebconf\-preseed\fR=medium|filesystem|\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
Allows one to fetch and apply one or more debconf preseed files to be applied to the debconf database. Note that the URLs must be fetchable by wget (http, ftp or file://).
.br
-If the file is placed on the live medium, it can be fetched with file:///lib/live/mount/medium/\fIFILE\fR, or with file:///\fIFILE\fR if it is in the root filesystem of the live system itself.
+If the file is placed on the live medium, it can be fetched with file:///run/live/medium/\fIFILE\fR, or with file:///\fIFILE\fR if it is in the root filesystem of the live system itself.
.br
All preseed files in /usr/lib/live/config\-preseed/ in the root filesystem of the live system can be automatically enabled with the keyword 'filesystem'.
.br
@@ -80,7 +80,7 @@ Allows one to set WLAN driver instead of autodetecting it. If a PCI ID is specif
.IP "\fBlive\-config.hooks\fR=filesystem|medium|\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR | \fBhooks\fR=medium|filesystem|\fIURL1\fR|\fIURL2\fR| ... |\fIURLn\fR" 4
Allows one to fetch and execute one or more arbitrary files. Note that the URLs must be fetchable by wget (http, ftp or file://), the files are executed in /tmp of the running live system, and that the files needs their dependencies, if any, already installed, e.g. if a python script should be executed the system needs python installed. Some hooks for some common use-cases are available at /usr/share/doc/live-config/examples/hooks/.
.br
-If the file is placed on the live medium, it can be fetched with file:///lib/live/mount/medium/\fIFILE\fR, or with file:///\fIFILE\fR if it is in the root filesystem of the live system itself.
+If the file is placed on the live medium, it can be fetched with file:///run/live/medium/\fIFILE\fR, or with file:///\fIFILE\fR if it is in the root filesystem of the live system itself.
.br
All hooks in /usr/lib/live/config\-hooks/ in the root filesystem of the live system can be automatically enabled with the keyword 'filesystem'.
.br
Reply to: