config: rename the config set/check functions for clarity

Gbp-Dch: Short
Closes: #952920

4 files changed, 8 insertions, 8 deletions

diff --git a/functions/defaults.sh b/functions/defaults.sh
index ed271ebc9..77700a586 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -76,7 +76,7 @@ New_configuration ()
 	export LIVE_IMAGE_TYPE
 }
 
-Set_defaults ()
+Set_config_defaults ()
 {
 	# FIXME
 	New_configuration
@@ -822,7 +822,7 @@ Set_defaults ()
 	LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES:-tar}"
 }
 
-Check_defaults ()
+Check_config_defaults ()
 {
 	case "${LB_BINARY_FILESYSTEM}" in
 		ntfs)
diff --git a/functions/init.sh b/functions/init.sh
index ccd8a5ebf..1fc653224 100755
--- a/functions/init.sh
+++ b/functions/init.sh
@@ -27,7 +27,7 @@ Init_config_data ()
 	Arguments "${@}"
 
 	Read_conffiles $(Common_config_files)
-	Set_defaults
+	Set_config_defaults
 }
 
 Maybe_auto_redirect ()
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