manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

binary_rootfs: use new chroot_prep helper

This commit is contained in:
Lyndon Brown 2020-04-05 20:07:44 +01:00 committed by Raphaël Hertzog
parent f24ed6ba3e
commit d171426ae4
1 changed files with 6 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
scripts/build/binary_rootfs
View File

@ -135,36 +135,12 @@ case "${LB_CHROOT_FILESYSTEM}" in
Remove_lockfile Remove_lockfile
mv chroot/chroot chroot.tmp mv chroot/chroot chroot.tmp
lb chroot_archives binary remove "${@}" lb chroot_prep remove all mode-archives-binary "${@}"
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 "${@}"
rm -rf chroot rm -rf chroot
mv chroot.tmp chroot mv chroot.tmp chroot
lb chroot_devpts install "${@}" lb chroot_prep install all mode-archives-binary "${@}"
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 "${@}"
touch .lock touch .lock
else else
@ -225,36 +201,12 @@ case "${LB_CHROOT_FILESYSTEM}" in
Remove_lockfile Remove_lockfile
mv chroot/chroot chroot.tmp mv chroot/chroot chroot.tmp
lb chroot_archives binary remove "${@}" lb chroot_prep remove all mode-archives-binary "${@}"
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 "${@}"
rm -rf chroot rm -rf chroot
mv chroot.tmp chroot mv chroot.tmp chroot
lb chroot_devpts install "${@}" lb chroot_prep install all mode-archives-binary "${@}"
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 "${@}"
touch .lock touch .lock
else else
@ -362,36 +314,12 @@ case "${LB_CHROOT_FILESYSTEM}" in
Remove_lockfile Remove_lockfile
mv chroot/chroot chroot.tmp mv chroot/chroot chroot.tmp
lb chroot_archives binary remove "${@}" lb chroot_prep remove all mode-archives-binary "${@}"
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 "${@}"
rm -rf chroot rm -rf chroot
mv chroot.tmp chroot mv chroot.tmp chroot
lb chroot_devpts install "${@}" lb chroot_prep install all mode-archives-binary "${@}"
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 "${@}"
touch .lock touch .lock
else else