[SCM] live-build branch, debian, updated. debian/2.0_a28-1-12-g43666a8

Daniel Baumann daniel at debian.org
Thu Sep 16 19:25:30 UTC 2010


The following commit has been merged in the debian branch:
commit df8bb8ecf7de5d82d49818dd6e9ab5d79d4e7a79
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 16 16:22:44 2010 +0200

    Also populating config tree automatically when calling other top-level commands apart from lb_build.

diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary
index d9cd28c..8598e3e 100755
--- a/scripts/build/lb_binary
+++ b/scripts/build/lb_binary
@@ -13,6 +13,13 @@ set -e
 # Including common functions
 . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
 
+# Automatically populating config tree
+if [ -x auto/config ] && [ ! -e .stage/config ]
+then
+	Echo_message "Automatically populating config tree."
+	lb config
+fi
+
 # Setting static variables
 DESCRIPTION="$(Echo 'build binary images')"
 HELP=""
diff --git a/scripts/build/lb_bootstrap b/scripts/build/lb_bootstrap
index 0bd2585..3239600 100755
--- a/scripts/build/lb_bootstrap
+++ b/scripts/build/lb_bootstrap
@@ -13,6 +13,13 @@ set -e
 # Including common functions
 . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
 
+# Automatically populating config tree
+if [ -x auto/config ] && [ ! -e .stage/config ]
+then
+	Echo_message "Automatically populating config tree."
+	lb config
+fi
+
 # Setting static variables
 DESCRIPTION="$(Echo 'bootstrap a Debian system')"
 HELP=""
diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index b5baef4..09e1875 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -13,6 +13,13 @@ set -e
 # Including common functions
 . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
 
+# Automatically populating config tree
+if [ -x auto/config ] && [ ! -e .stage/config ]
+then
+	Echo_message "Automatically populating config tree."
+	lb config
+fi
+
 # Setting static variables
 DESCRIPTION="$(Echo 'customize the Debian system')"
 HELP=""
diff --git a/scripts/build/lb_source b/scripts/build/lb_source
index 00d2ce7..e790223 100755
--- a/scripts/build/lb_source
+++ b/scripts/build/lb_source
@@ -13,6 +13,13 @@ set -e
 # Including common functions
 . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
 
+# Automatically populating config tree
+if [ -x auto/config ] && [ ! -e .stage/config ]
+then
+	Echo_message "Automatically populating config tree."
+	lb config
+fi
+
 # Setting static variables
 DESCRIPTION="$(Echo 'build source images')"
 HELP=""

-- 
live-build



More information about the debian-live-changes mailing list