summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrégory David <groolot@groolot.net>2016-03-10 15:10:36 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-07-29 05:40:21 +0000
commit8458c04eaeda2fc5ac45d5199e6ea73436f0648c (patch)
tree4cd7cf39bb423c9c189a66c44b930bb9d6dfafd1
parentFixing timezone configuration by dropping /etc/localtime (Closes: #832816). (diff)
downloadsystem-config-8458c04eaeda2fc5ac45d5199e6ea73436f0648c.tar.xz
system-config-8458c04eaeda2fc5ac45d5199e6ea73436f0648c.zip
Searching and reading live-config file(s) configuration from medium (live image or other device) in persistence mode (Closes: #832817).
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xfrontend/live-config3
1 files changed, 2 insertions, 1 deletions
diff --git a/frontend/live-config b/frontend/live-config
index 8c70c71..e46e311 100755
--- a/frontend/live-config
+++ b/frontend/live-config
@@ -42,7 +42,8 @@ _COMPONENTS="$(ls /lib/live/config/*)"
# Reading configuration files from filesystem and live-media
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/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
do
if [ -e "${_FILE}" ]
then