summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lamb <chris@chris-lamb.co.uk>2008-08-07 20:04:47 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:37 +0100
commitc0d2b4ef055b16689a732a16b467ef5f6786a5a0 (patch)
tree846d9a7f8f0d9443464b203ae809660ae0f31a91
parentbd4a6204bb3cd3b96d53d07829065b07e4a4f762 (diff)
downloadlive-build-c0d2b4ef055b16689a732a16b467ef5f6786a5a0.zip
live-build-c0d2b4ef055b16689a732a16b467ef5f6786a5a0.tar.gz
Call "Check_defaults" in lh_build.
This ensures that incompatible configurations that are created by editing files in config/ are detected when building the image via lh_build. This also has the side-effect of ensuring that configuration warnings (if any) appear for live-magic.
-rwxr-xr-xhelpers/lh_build7
1 files changed, 7 insertions, 0 deletions
diff --git a/helpers/lh_build b/helpers/lh_build
index 8d38890..bb07c83 100755
--- a/helpers/lh_build
+++ b/helpers/lh_build
@@ -41,6 +41,13 @@ then
exit 1
fi
+# Reading configuration files
+Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Checking defaults
+Check_defaults
+
# Bootstrapping system
lh_bootstrap ${*}