summaryrefslogtreecommitdiff
path: root/scripts/build/bootstrap
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-04-01 09:29:52 +0100
committerRaphaƫl Hertzog <hertzog@debian.org>2020-04-23 09:38:01 +0000
commit11836c0c18b07f4bd1ea22a2163875975f3e6816 (patch)
treea3534b7d09a538fecec2379fdba0a7c6a12247a2 /scripts/build/bootstrap
parentf6a50b6db204fa1a6d0ae8b371c4108911aed0eb (diff)
downloadvyos-live-build-11836c0c18b07f4bd1ea22a2163875975f3e6816.tar.gz
vyos-live-build-11836c0c18b07f4bd1ea22a2163875975f3e6816.zip
fix $@ parameter expansion issues
$@ when unquoted is subject to further word splitting. this fixes a bunch of instances where it was incorrectly being used unquoted. Gbp-Dch: Short
Diffstat (limited to 'scripts/build/bootstrap')
-rwxr-xr-xscripts/build/bootstrap56
1 files changed, 28 insertions, 28 deletions
diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap
index f46075336..dcb4f710b 100755
--- a/scripts/build/bootstrap
+++ b/scripts/build/bootstrap
@@ -28,38 +28,38 @@ Init_config_data "${@}"
Setup_clean_exit
# Bootstrapping system
-lb bootstrap_cache restore ${@}
-lb bootstrap_debootstrap ${@}
-lb bootstrap_cache save ${@}
+lb bootstrap_cache restore "${@}"
+lb bootstrap_debootstrap "${@}"
+lb bootstrap_cache save "${@}"
# Configuring chroot
-lb chroot_devpts install ${@}
-lb chroot_proc install ${@}
-lb chroot_selinuxfs install ${@}
-lb chroot_sysfs install ${@}
-lb chroot_debianchroot install ${@}
-lb chroot_dpkg install ${@}
-lb chroot_tmpfs install ${@}
-lb chroot_sysv-rc install ${@}
-lb chroot_hosts install ${@}
-lb chroot_resolv install ${@}
-lb chroot_hostname install ${@}
-lb chroot_apt install ${@}
+lb chroot_devpts install "${@}"
+lb chroot_proc install "${@}"
+lb chroot_selinuxfs install "${@}"
+lb chroot_sysfs install "${@}"
+lb chroot_debianchroot install "${@}"
+lb chroot_dpkg install "${@}"
+lb chroot_tmpfs install "${@}"
+lb chroot_sysv-rc install "${@}"
+lb chroot_hosts install "${@}"
+lb chroot_resolv install "${@}"
+lb chroot_hostname install "${@}"
+lb chroot_apt install "${@}"
-lb bootstrap_archives binary ${@}
+lb bootstrap_archives binary "${@}"
# Deconfiguring chroot
-lb chroot_apt remove ${@}
-lb chroot_hostname remove ${@}
-lb chroot_resolv remove ${@}
-lb chroot_hosts remove ${@}
-lb chroot_sysv-rc remove ${@}
-lb chroot_tmpfs remove ${@}
-lb chroot_dpkg remove ${@}
-lb chroot_debianchroot remove ${@}
-lb chroot_sysfs remove ${@}
-lb chroot_selinuxfs remove ${@}
-lb chroot_proc remove ${@}
-lb chroot_devpts remove ${@}
+lb chroot_apt remove "${@}"
+lb chroot_hostname remove "${@}"
+lb chroot_resolv remove "${@}"
+lb chroot_hosts remove "${@}"
+lb chroot_sysv-rc remove "${@}"
+lb chroot_tmpfs remove "${@}"
+lb chroot_dpkg remove "${@}"
+lb chroot_debianchroot remove "${@}"
+lb chroot_sysfs remove "${@}"
+lb chroot_selinuxfs remove "${@}"
+lb chroot_proc remove "${@}"
+lb chroot_devpts remove "${@}"
Echo_message "Bootstrap stage completed"