summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2020-03-31 13:10:21 +0200
committer Eric Hameleers <alien@slackware.com>2020-03-31 13:10:21 +0200
commit6d01738bd50d369ae95f71406fb8d84c06caafca (patch)
tree62e239ed806483fde4061bf86238fd1aa907c812
parent3217807ae10ec6d62284764811be651dfe7e4049 (diff)
downloadliveslak-6d01738bd50d369ae95f71406fb8d84c06caafca.tar.gz
liveslak-6d01738bd50d369ae95f71406fb8d84c06caafca.tar.xz
Correctly read OS configuration from disk file if present
Liveslak can optionally load a OS config file "@DISTRO@_os.cfg" from within the 'livemain' directory on the boot medium, which contains "VARIABLE=value" lines, where VARIABLE is one of the following variables: BLACKLIST, KEYMAP, LIVE_HOSTNAME, LOAD, LOCALE, LUKSVOL, NOLOAD, RUNLEVEL, TWEAKS, TZ, XKB. During boot, any variable from that file will be set in the boot environment if it has not yet been defined in the init script. You can prevent this behaviour by adding 'cfg=skip' to the boot commandline.
-rw-r--r--liveinit.tpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/liveinit.tpl b/liveinit.tpl
index 3ac0782..6b15131 100644
--- a/liveinit.tpl
+++ b/liveinit.tpl
@@ -759,8 +759,8 @@ if [ "$RESCUE" = "" ]; then
BLACKLIST KEYMAP LIVE_HOSTNAME LOAD LOCALE LUKSVOL \
NOLOAD RUNLEVEL TWEAKS TZ XKB ;
do
- if [ -n "${LIVEPARM}" ]; then
- eval $(grep -w ${LIVEPARM} /mnt/media/${LIVEMAIN}/${DISTROCFG})
+ if [ -n "$(eval echo \$${LIVEPARM})" ]; then
+ eval $(grep -w ^${LIVEPARM} /mnt/media/${LIVEMAIN}/${DISTROCFG})
fi
done
fi