diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-01 10:58:47 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 15:54:19 +0200 |
| commit | 6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4 (patch) | |
| tree | c91a79037457e7bb2c0630fa8c065bee6c465bad /scripts/build/config | |
| parent | 6def2c27be28169cf3e0757a6928e3f13de157a8 (diff) | |
| download | vyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.tar.gz vyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.zip | |
rename LB_ARCHITECTURES to LB_ARCHITECTURE
this was previously not done in 8b109ffb96282a6dd1aa5d61aa935bcba69c56f1
to keep the renaming simple, but leaving the variable plural is a cause
for confusion.
since this property is stored in the INI style config/build config file
rather than a shell script based one, at the property there is already
singular, there was no need for a backwards compatibility hack.
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/config')
| -rwxr-xr-x | scripts/build/config | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/config b/scripts/build/config index 674026212..797fa11ba 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -361,7 +361,7 @@ Local_arguments () ;; -a|--architecture|--architectures) - LB_ARCHITECTURES="${2}" + LB_ARCHITECTURE="${2}" shift 2 ;; @@ -966,10 +966,10 @@ fi if [ ! -e config ] then - Echo_message "Creating config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system" + Echo_message "Creating config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURE} system" mkdir config else - Echo_message "Updating config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system" + Echo_message "Updating config tree for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURE} system" fi # Creating live-build configuration @@ -1364,7 +1364,7 @@ fi cat > config/build << EOF [Image] -Architecture: ${LB_ARCHITECTURES} +Architecture: ${LB_ARCHITECTURE} Archive-Areas: ${LB_ARCHIVE_AREAS} Distribution-Chroot: ${LB_DISTRIBUTION_CHROOT} Distribution-Binary: ${LB_DISTRIBUTION_BINARY} |