diff options
author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-28 05:37:14 +0000 |
---|---|---|
committer | Raphaƫl Hertzog <hertzog@debian.org> | 2020-04-23 14:51:58 +0200 |
commit | 7de8a0faa7ef647f175650607c693dad18f227e5 (patch) | |
tree | 01c87deb708c0ecffa64a38da4fa2224f772dfae /scripts/build | |
parent | 430fdc3040b6a05819a2926779c3d12e77fbd3c0 (diff) | |
download | vyos-live-build-7de8a0faa7ef647f175650607c693dad18f227e5.tar.gz vyos-live-build-7de8a0faa7ef647f175650607c693dad18f227e5.zip |
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
Diffstat (limited to 'scripts/build')
-rwxr-xr-x | scripts/build/build | 4 | ||||
-rwxr-xr-x | scripts/build/config | 8 |
2 files changed, 6 insertions, 6 deletions
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 |