summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-04-21 16:40:46 +0200
committer Eric Hameleers <alien@slackware.com>2016-04-21 16:40:46 +0200
commit031d7b24db90280c437d82fc76a1f1f57403aa7d (patch)
tree7658c988e74f21b2c8a73c7bed6b5a008149034e
parent8f6fc18357c512522d9f252dd015b1d35b064a36 (diff)
downloadliveslak-031d7b24db90280c437d82fc76a1f1f57403aa7d.tar.gz
liveslak-031d7b24db90280c437d82fc76a1f1f57403aa7d.tar.xz
Allow CONFFILE to be specified as an environment variable.
-rwxr-xr-xmake_slackware_live.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 38a95eb..5cbc324 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -42,7 +42,7 @@ VERSION="0.8.0"
LIVE_TOOLDIR=${LIVE_TOOLDIR:-"$(cd $(dirname $0); pwd)"}
# Load the optional configuration file:
-CONFFILE=${LIVE_TOOLDIR}/$(basename $0 .sh).conf
+CONFFILE=${CONFFILE:-"${LIVE_TOOLDIR}/$(basename $0 .sh).conf"}
if [ -f ${CONFFILE} ]; then
echo "-- Loading configuration file."
. ${CONFFILE}