diff options
| -rwxr-xr-x | functions/defaults.sh | 2 | ||||
| -rwxr-xr-x | scripts/build/build | 4 | ||||
| -rwxr-xr-x | scripts/build/config | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 74e6f0e73..87b3a5351 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -589,7 +589,7 @@ Set_config_defaults () LB_BOOTSTRAP_QEMU_STATIC="${LB_BOOTSTRAP_QEMU_STATIC:-}" } -Check_config_defaults () +Validate_config () { case "${LB_BINARY_FILESYSTEM}" in ntfs) 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 |