summaryrefslogtreecommitdiff
path: root/scripts
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
commit0dee07f122ca2d77c9815d095084064fcd4a7f75 (patch)
tree88f851187dda345e7c088c1f453047af6b848a82 /scripts
parentb4598b234c90b6d1c93bd64166d4aa46ce9388bb (diff)
downloadvyos-live-build-0dee07f122ca2d77c9815d095084064fcd4a7f75.tar.gz
vyos-live-build-0dee07f122ca2d77c9815d095084064fcd4a7f75.zip
config: rename the config set/check functions for clarity
Gbp-Dch: Short Closes: #952920
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/build2
-rwxr-xr-xscripts/build/config8
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/build b/scripts/build/build
index 6b24d9702..020771b9d 100755
--- a/scripts/build/build
+++ b/scripts/build/build
@@ -49,7 +49,7 @@ fi
Init_config_data "${@}"
# Checking defaults
-Check_defaults
+Check_config_defaults
Echo_message "live-build ${LIVE_BUILD_VERSION}"
Echo_message "Building config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system"
diff --git a/scripts/build/config b/scripts/build/config
index fac822f28..ce4a24542 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -913,8 +913,8 @@ then
fi
# Setting and checking defaults
-Set_defaults
-Check_defaults
+Set_config_defaults
+Check_config_defaults
if [ ! -e config ]
then
@@ -1398,8 +1398,8 @@ EOF
mkdir -p auto
mkdir -p local/bin
-# Checking defaults again
-Check_defaults
+# Check defaults again
+Check_config_defaults
if [ "${_CLEAN}" = "true" ]
then