From d171426ae48d2d315ef9ec32fb25c98d02d97875 Mon Sep 17 00:00:00 2001
From: Lyndon Brown <jnqnfe@gmail.com>
Date: Sun, 5 Apr 2020 20:07:44 +0100
Subject: [PATCH] binary_rootfs: use new chroot_prep helper

---
 scripts/build/binary_rootfs | 84 +++----------------------------------
 1 file 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