[SCM] debian-live branch, master, updated. 1.0_a48-1-24-g15ee6f0

Chris Lamb chris at chris-lamb.co.uk
Thu Aug 7 19:21:52 UTC 2008


The following commit has been merged in the master branch:
commit 2fc9cca9e8d74d1b04be47fc3b11cf6c23fef526
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Thu Aug 7 20:04:47 2008 +0100

    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.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

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 ${*}
 

-- 
debian-live



More information about the debian-live-changes mailing list