summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-09-16 16:22:44 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:23 +0100
commite02b31b73b8a01c28ffe6479a175b58a4dc389ff (patch)
treefc9d5169f1bf602d2d5da3feee13010957389e12
parent916ee6c9755ec9402f0aea8ecaa93e78de4ff2f0 (diff)
downloadvyos-live-build-e02b31b73b8a01c28ffe6479a175b58a4dc389ff.tar.gz
vyos-live-build-e02b31b73b8a01c28ffe6479a175b58a4dc389ff.zip
Also populating config tree automatically when calling other top-level commands apart from lb_build.
-rwxr-xr-xscripts/build/lb_binary7
-rwxr-xr-xscripts/build/lb_bootstrap7
-rwxr-xr-xscripts/build/lb_chroot7
-rwxr-xr-xscripts/build/lb_source7
4 files changed, 28 insertions, 0 deletions
diff --git a/scripts/build/lb_binary b/scripts/build/lb_binary
index d9cd28c38..8598e3ed6 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 0bd258534..323960023 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 b5baef458..09e18757a 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 00d2ce713..e790223f7 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=""