diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-28 05:42:34 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 14:52:20 +0200 |
| commit | 5fb790e43e5dff20340278f9ca7a66939b0f15f9 (patch) | |
| tree | 854f275cbf003e290bd0a515020bff0cb3785f3c | |
| parent | 7de8a0faa7ef647f175650607c693dad18f227e5 (diff) | |
| download | vyos-live-build-5fb790e43e5dff20340278f9ca7a66939b0f15f9.tar.gz vyos-live-build-5fb790e43e5dff20340278f9ca7a66939b0f15f9.zip | |
config: rename Set_config_defaults() to Prepare_config()
it mostly applies defaults where a value does not exist, but does more in
some cases. the new name better reflects its usage and functionality.
Gbp-Dch: Short
| -rwxr-xr-x | functions/defaults.sh | 3 | ||||
| -rwxr-xr-x | functions/init.sh | 2 | ||||
| -rwxr-xr-x | scripts/build/config | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 87b3a5351..dd0ef9f77 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -69,7 +69,8 @@ New_configuration () export LIVE_IMAGE_TYPE } -Set_config_defaults () +# Prepare config for use, filling in defaults where no value provided for instance +Prepare_config () { # FIXME New_configuration diff --git a/functions/init.sh b/functions/init.sh index 23c403427..c050b495b 100755 --- a/functions/init.sh +++ b/functions/init.sh @@ -28,7 +28,7 @@ Init_config_data () Arguments "${@}" Read_conffiles $(Common_config_files) - Set_config_defaults + Prepare_config } # "Auto" script redirection. diff --git a/scripts/build/config b/scripts/build/config index 74c11ba0b..d9ada6f84 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -937,7 +937,7 @@ then fi # Setting and validating config -Set_config_defaults +Prepare_config Validate_config # Creating or updating saved config |