summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-09-07 16:22:59 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:21 +0100
commitc47ce2ee0368b085ed3b1378c0def33e90446111 (patch)
treee8bf6e1009d6bcd7caeca6e89c94942a30a74548 /scripts/build
parent83bc63f725263c571094e3af1c88c58992bf0ac6 (diff)
downloadlive-build-c47ce2ee0368b085ed3b1378c0def33e90446111.zip
live-build-c47ce2ee0368b085ed3b1378c0def33e90446111.tar.gz
Moving location of the global configuration file from /etc/default/live-build to /etc/live/build.conf resp. /etc/live/build.d/.
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/config8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/config b/scripts/build/config
index c4ce1e8..38ae64e 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -26,7 +26,6 @@ then
fi
# Setting static variables
-SYSTEM_LB_CONFFILE="/etc/default/live-build"
DESCRIPTION="$(Echo 'create configuration for live-build(7)')"
USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--apt-ftp-proxy URL]\n\
@@ -795,10 +794,11 @@ Local_arguments ()
}
# Reading system configuration
-if [ -f "${SYSTEM_LB_CONFFILE}" ] && ! In_list "--ignore-system-defaults" "${@}"
+if ! In_list "--ignore-system-defaults" "${@}"
then
- Echo_message "Considering defaults defined in %s" "${SYSTEM_LB_CONFFILE}"
- Read_conffiles "${SYSTEM_LB_CONFFILE}"
+ Echo_message "Considering defaults defined in %s" "/etc/live/build.conf"
+
+ Read_conffiles /etc/live/config.conf /etc/live/config.d/*
fi
# Reading existing configuration