summaryrefslogtreecommitdiff
path: root/scripts/build/config
diff options
context:
space:
mode:
authorjnqnfe <jnqnfe@gmail.com>2015-02-05 03:30:47 +0000
committerLuca Boccassi <bluca@debian.org>2020-03-10 12:39:37 +0000
commitdff08fa3f7b05be9b86e03dd8a1473b7ff41340f (patch)
tree0fe8759090791a3d88744669e3578d18565f9ab1 /scripts/build/config
parent061d7cb3406c99a8bbb7b563625fe00357ba90aa (diff)
downloadvyos-live-build-dff08fa3f7b05be9b86e03dd8a1473b7ff41340f.tar.gz
vyos-live-build-dff08fa3f7b05be9b86e03dd8a1473b7ff41340f.zip
tidy script init (3/4) - top level commands
Partialfix for #952919 Gbp-Dch: Short
Diffstat (limited to 'scripts/build/config')
-rwxr-xr-xscripts/build/config6
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/build/config b/scripts/build/config
index 039bf6871..c3905b656 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -882,7 +882,7 @@ then
fi
fi
-# Read meta config
+# Redirecting to auto script if required
if [ "${1}" != "noauto" ] && [ -x auto/config ]
then
Echo_message "Executing auto/config script."
@@ -918,10 +918,8 @@ then
Read_conffiles "${_CONFFILE}"
fi
-# Setting defaults
+# Setting and checking defaults
Set_defaults
-
-# Checking defaults
Check_defaults
if [ ! -e config ]