From 75182d719311a0d23d8eea53f33e186998e5e6ec Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 7 Sep 2010 16:22:59 +0200 Subject: Moving location of the global configuration file from /etc/default/live-build to /etc/live/build.conf resp. /etc/live/build.d/. --- scripts/build/config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/build/config b/scripts/build/config index c4ce1e8c4..38ae64e11 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 -- cgit v1.2.3