manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions/defaults.sh
View File

@ -76,7 +76,7 @@ New_configuration ()
export LIVE_IMAGE_TYPE export LIVE_IMAGE_TYPE
} }
Set_defaults () Set_config_defaults ()
{ {
# FIXME # FIXME
New_configuration New_configuration
@ -822,7 +822,7 @@ Set_defaults ()
LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES:-tar}" LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES:-tar}"
} }
Check_defaults () Check_config_defaults ()
{ {
case "${LB_BINARY_FILESYSTEM}" in case "${LB_BINARY_FILESYSTEM}" in
ntfs) ntfs)

2
functions/init.sh
View File

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

2
scripts/build/build
View File

@ -49,7 +49,7 @@ fi
Init_config_data "${@}" Init_config_data "${@}"
# Checking defaults # Checking defaults
Check_defaults Check_config_defaults
Echo_message "live-build ${LIVE_BUILD_VERSION}" Echo_message "live-build ${LIVE_BUILD_VERSION}"
Echo_message "Building config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system" Echo_message "Building config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system"

8
scripts/build/config
View File

@ -913,8 +913,8 @@ then
fi fi
# Setting and checking defaults # Setting and checking defaults
Set_defaults Set_config_defaults
Check_defaults Check_config_defaults
if [ ! -e config ] if [ ! -e config ]
then then
@ -1398,8 +1398,8 @@ EOF
mkdir -p auto mkdir -p auto
mkdir -p local/bin mkdir -p local/bin
# Checking defaults again # Check defaults again
Check_defaults Check_config_defaults
if [ "${_CLEAN}" = "true" ] if [ "${_CLEAN}" = "true" ]
then then