Handling dist-upgrade right after bootstrap with copy of chroot_archives as bootstrap_archives in preparation for a future multi-archive bootstrap.

It is important for derivatives that the bootstrap cache is setup completely,
it is re-used in several places and thus cannot consist of the parent
distribution only.

Until there's a supportable way to bootstrap from multiple archives at the same time
(and multistrap doesn't work for that as discussed in the past), we're going to run
a lot of duplicated code here to massage the apt sources for the time being.

1 files changed, 32 insertions, 0 deletions

diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap
index bf68b0cf5..b497fb6c7 100755
--- a/scripts/build/bootstrap
+++ b/scripts/build/bootstrap
@@ -36,4 +36,36 @@ Setup_cleanup
 
 # Bootstrapping system
 lb bootstrap_${LB_BOOTSTRAP}
+
+# 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_upstart install ${@}
+lb chroot_hosts install ${@}
+lb chroot_resolv install ${@}
+lb chroot_hostname install ${@}
+lb chroot_apt install ${@}
+
 lb bootstrap_archive-keys ${@}
+lb bootstrap_archives ${@}
+
+# 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_upstart 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 ${@}