diff options
| author | Daniel Baumann <daniel@debian.org> | 2013-02-19 10:00:45 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:06 +0200 |
| commit | 11b07e9a415f54a36c8ac0fee02dfc955515cceb (patch) | |
| tree | 7f8479a487665fb62de07c104d81b176f221707b /scripts | |
| parent | 7f972f31ced0eaa8453416b740ec3746160f6c5c (diff) | |
| download | vyos-live-build-11b07e9a415f54a36c8ac0fee02dfc955515cceb.tar.gz vyos-live-build-11b07e9a415f54a36c8ac0fee02dfc955515cceb.zip | |
Making messages about reading system conffiles in lb config more accurate.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/config | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/build/config b/scripts/build/config index 7b7fe4bd6..b70f9ca2f 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -919,11 +919,16 @@ then fi # Reading system configuration -if ! In_list "--ignore-system-defaults" "${@}" +if ls /etc/live/build.conf > /dev/null 2>&1 || ls /etc/live/build/* > /dev/null 2>&1 then - Echo_message "Considering defaults defined in %s" "/etc/live/build.conf" + if In_list "--ignore-system-defaults" "${@}" + then + Echo_message "Ignoring defaults in %s" "/etc/live/build.conf" + else + Echo_message "Using defaults in %s" "/etc/live/build.conf" - Read_conffiles /etc/live/build.conf /etc/live/build/* + Read_conffiles /etc/live/build.conf /etc/live/build/* + fi fi # Reading existing configuration |