chroot_prep: expand coverage

it now covers:
 - `lb chroot_apt install-binary`
 - `lb chroot_archives {chroot|binary|source} {install|remove}`

by expanding usage from:
`lb chroot_prep {install|remove} HELPERS [ARGS]`
to:
`lb chroot_prep {install|remove} HELPERS [MODE[ MODE..]] [ARGS]`

where `[MODE[ MODE..]]` is an optional set of one or more of:
 - archives-chroot, which specifies to use 'chroot' as the first param to
   the chroot_archives script
 - archives-binary, which specifies to use 'binary'
 - archives-source, which specifies to use 'source'
 - apt-install-binary, which specified to pass 'install-binary' instead of
   'install' to chroot_apt

thus _all_ chroot prep scripts can be run through this helper now!

note, in the case of the binary stage, 'archives' is deliberately not added
to CHROOT_PREP_OTHER, this is not a mistake!

Gbp-Dch: Short

1 files changed, 2 insertions, 4 deletions

diff --git a/scripts/build/installer b/scripts/build/installer
index bab2a6d32..30d27990b 100755
--- a/scripts/build/installer
+++ b/scripts/build/installer
@@ -29,8 +29,7 @@ Setup_clean_exit
 
 if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]; then
 	# Configuring chroot
-	lb chroot_prep install all "${@}"
-	lb chroot_archives chroot install "${@}"
+	lb chroot_prep install all mode-archives-chroot "${@}"
 fi
 
 # Building installer
@@ -39,8 +38,7 @@ lb installer_preseed "${@}"
 
 if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]; then
 	# Deconfiguring chroot
-	lb chroot_archives chroot remove "${@}"
-	lb chroot_prep remove all "${@}"
+	lb chroot_prep remove all mode-archives-chroot "${@}"
 fi
 
 Echo_message "Installer stage completed"