diff options
| author | Daniel Baumann <daniel@debian.org> | 2013-02-19 10:00:45 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2013-04-09 05:40:15 +0200 |
| commit | dd6f9b7cfae47067f86a39827e40475883432331 (patch) | |
| tree | 0e1b2ffb7e011a2f370fb8eefc22e66fc15fcb66 /scripts/build | |
| parent | 1c3bfa405c2e48cb9d0ab595072fcbbb173199e3 (diff) | |
| download | vyos-live-build-dd6f9b7cfae47067f86a39827e40475883432331.tar.gz vyos-live-build-dd6f9b7cfae47067f86a39827e40475883432331.zip | |
Making messages about reading system conffiles in lb config more accurate.
Diffstat (limited to 'scripts/build')
| -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 6b4c3f680..d1d820a6b 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -925,11 +925,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 |