diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-05 20:07:44 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 09:38:02 +0000 |
| commit | d171426ae48d2d315ef9ec32fb25c98d02d97875 (patch) | |
| tree | 4507666f0c7f3c22eec4a306bef6e59fe27c6231 | |
| parent | f24ed6ba3e61eb38a648e28eb647fac1fa25fb8e (diff) | |
| download | vyos-live-build-d171426ae48d2d315ef9ec32fb25c98d02d97875.tar.gz vyos-live-build-d171426ae48d2d315ef9ec32fb25c98d02d97875.zip | |
binary_rootfs: use new chroot_prep helper
| -rwxr-xr-x | scripts/build/binary_rootfs | 84 |
1 files changed, 6 insertions, 78 deletions
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index cad1ea038..a4eb7e5ea 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -135,36 +135,12 @@ case "${LB_CHROOT_FILESYSTEM}" in Remove_lockfile mv chroot/chroot chroot.tmp - lb chroot_archives binary 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 "${@}" + lb chroot_prep remove all mode-archives-binary "${@}" rm -rf chroot mv chroot.tmp 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_archives binary install "${@}" + lb chroot_prep install all mode-archives-binary "${@}" touch .lock else @@ -225,36 +201,12 @@ case "${LB_CHROOT_FILESYSTEM}" in Remove_lockfile mv chroot/chroot chroot.tmp - lb chroot_archives binary 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 "${@}" + lb chroot_prep remove all mode-archives-binary "${@}" rm -rf chroot mv chroot.tmp 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_archives binary install "${@}" + lb chroot_prep install all mode-archives-binary "${@}" touch .lock else @@ -362,36 +314,12 @@ case "${LB_CHROOT_FILESYSTEM}" in Remove_lockfile mv chroot/chroot chroot.tmp - lb chroot_archives binary 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 "${@}" + lb chroot_prep remove all mode-archives-binary "${@}" rm -rf chroot mv chroot.tmp 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_archives binary install "${@}" + lb chroot_prep install all mode-archives-binary "${@}" touch .lock else |