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/bootstrap_debootstrap | |
| 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/bootstrap_debootstrap')
| -rwxr-xr-x | scripts/build/bootstrap_debootstrap | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index fd212bb1e..3ff20a70e 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -48,9 +48,9 @@ Acquire_lockfile mkdir -p chroot # Setting debootstrap options -if [ -n "${LB_ARCHITECTURES}" ] +if [ -n "${LB_ARCHITECTURE}" ] then - DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}" + DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURE}" fi if [ "${LB_ARCHIVE_AREAS}" != "main" ] @@ -95,7 +95,7 @@ fi Echo_breakage "Running debootstrap... " # Run appropriate bootstrap, i.e. foreign or regular bootstrap -if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LB_ARCHITECTURES}" ]; then +if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LB_ARCHITECTURE}" ]; then if [ -n "${LB_BOOTSTRAP_QEMU_EXCLUDE}" ] then |