manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making messages about reading system conffiles in lb config more accurate.

This commit is contained in:
Daniel Baumann 2013-02-19 10:00:45 +01:00 committed by Daniel Baumann
parent 7f972f31ce
commit 11b07e9a41
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/build/config
View File

@ -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