From 7de8a0faa7ef647f175650607c693dad18f227e5 Mon Sep 17 00:00:00 2001
From: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat, 28 Mar 2020 05:37:14 +0000
Subject: config: rename Check_config_defaults() to Validate_config()

this is used after applying user settings on top of the defaults,
so is not specific to checking defaults; it's a validation checker.

Gbp-Dch: Short
---
 scripts/build/build  | 4 ++--
 scripts/build/config | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'scripts/build')

diff --git a/scripts/build/build b/scripts/build/build
index 4adc3ee8d..f8ee8988c 100755
--- a/scripts/build/build
+++ b/scripts/build/build
@@ -48,8 +48,8 @@ fi
 # Processing arguments and configuration files
 Init_config_data "${@}"
 
-# Checking defaults
-Check_config_defaults
+# Validating config
+Validate_config
 
 Echo_message "live-build ${LIVE_BUILD_VERSION}"
 Echo_message "Building for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system"
diff --git a/scripts/build/config b/scripts/build/config
index 3cb31f660..74c11ba0b 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -936,9 +936,9 @@ then
 	Read_conffiles "${_CONFFILE}"
 fi
 
-# Setting and checking defaults
+# Setting and validating config
 Set_config_defaults
-Check_config_defaults
+Validate_config
 
 # Creating or updating saved config
 
@@ -1412,8 +1412,8 @@ EOF
 mkdir -p auto
 mkdir -p local/bin
 
-# Check defaults again
-Check_config_defaults
+# Validate config again
+Validate_config
 
 if [ "${_CLEAN}" = "true" ]
 then
-- 
cgit v1.2.3