config: rename the config set/check functions for clarity

Gbp-Dch: Short
Closes: #952920
This commit is contained in:
jnqnfe 2015-02-05 03:30:47 +00:00 committed by Luca Boccassi
parent b4598b234c
commit 0dee07f122
4 changed files with 8 additions and 8 deletions

View File

@ -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)

View File

@ -27,7 +27,7 @@ Init_config_data ()
Arguments "${@}"
Read_conffiles $(Common_config_files)
Set_defaults
Set_config_defaults
}
Maybe_auto_redirect ()

View File

@ -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"

View File

@ -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