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

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
This commit is contained in:
Lyndon Brown 2020-03-28 05:37:14 +00:00 committed by Raphaël Hertzog
parent 430fdc3040
commit 7de8a0faa7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions/defaults.sh
View File

@ -589,7 +589,7 @@ Set_config_defaults ()
LB_BOOTSTRAP_QEMU_STATIC="${LB_BOOTSTRAP_QEMU_STATIC:-}" LB_BOOTSTRAP_QEMU_STATIC="${LB_BOOTSTRAP_QEMU_STATIC:-}"
} }
Check_config_defaults () Validate_config ()
{ {
case "${LB_BINARY_FILESYSTEM}" in case "${LB_BINARY_FILESYSTEM}" in
ntfs) ntfs)

4
scripts/build/build
View File

@ -48,8 +48,8 @@ fi
# Processing arguments and configuration files # Processing arguments and configuration files
Init_config_data "${@}" Init_config_data "${@}"
# Checking defaults # Validating config
Check_config_defaults Validate_config
Echo_message "live-build ${LIVE_BUILD_VERSION}" Echo_message "live-build ${LIVE_BUILD_VERSION}"
Echo_message "Building for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system" Echo_message "Building for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system"

8
scripts/build/config
View File

@ -936,9 +936,9 @@ then
Read_conffiles "${_CONFFILE}" Read_conffiles "${_CONFFILE}"
fi fi
# Setting and checking defaults # Setting and validating config
Set_config_defaults Set_config_defaults
Check_config_defaults Validate_config
# Creating or updating saved config # Creating or updating saved config
@ -1412,8 +1412,8 @@ EOF
mkdir -p auto mkdir -p auto
mkdir -p local/bin mkdir -p local/bin
# Check defaults again # Validate config again
Check_config_defaults Validate_config
if [ "${_CLEAN}" = "true" ] if [ "${_CLEAN}" = "true" ]
then then