[PATCH] isar-bootstrap: Remove leaked hostname and resolv.conf from images

[Henning Schild <henning.schild@siemens.com>]

debootstrap will leak the build hosts /etc/hostname and /etc/resolv.conf
into all rootfss it builds. That is done so the newly created rootfs
will have internet access once you chroot into it.

For the buildchroot we need internet and the leakage does not hurt, for
the final image we probably do not want any of these files anymore.

So split up the apt-get into a download and install phase and delete
the two files after fetching the packages, but only for the image and
not the buildchroot.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta-isar/recipes-core/images/isar-image-base.bb |  3 ++-
 meta/classes/isar-bootstrap-helper.bbclass       | 13 +++++++++----
 meta/recipes-devtools/buildchroot/buildchroot.bb |  3 ++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb
index c4799d3..989386c 100644
--- a/meta-isar/recipes-core/images/isar-image-base.bb
+++ b/meta-isar/recipes-core/images/isar-image-base.bb
@@ -36,7 +36,8 @@ do_rootfs() {
         mkdir -p $CDIRS
     fi
 
-    setup_root_file_system "${IMAGE_ROOTFS}" ${IMAGE_PREINSTALL} ${IMAGE_INSTALL}
+    setup_root_file_system "${IMAGE_ROOTFS}" "clean" \
+        ${IMAGE_PREINSTALL} ${IMAGE_INSTALL}
 
     # Configure root filesystem
     sudo install -m 755 "${WORKDIR}/${DISTRO_CONFIG_SCRIPT}" "${IMAGE_ROOTFS}"
diff --git a/meta/classes/isar-bootstrap-helper.bbclass b/meta/classes/isar-bootstrap-helper.bbclass
index a06116d..e062921 100644
--- a/meta/classes/isar-bootstrap-helper.bbclass
+++ b/meta/classes/isar-bootstrap-helper.bbclass
@@ -7,8 +7,13 @@
 
 setup_root_file_system() {
     ROOTFSDIR="$1"
+    CLEANHOSTLEAK="$2"
+    shift
     shift
     PACKAGES="$@"
+    APT_ARGS="install --yes --allow-unauthenticated \
+              -o Debug::pkgProblemResolver=yes"
+    CLEANHOSTLEAK_FILES="${ROOTFSDIR}/etc/hostname ${ROOTFSDIR}/etc/resolv.conf"
 
     sudo cp -Trpfx \
         "${DEPLOY_DIR_IMAGE}/isar-bootstrap-${DISTRO}-${DISTRO_ARCH}/" \
@@ -32,8 +37,8 @@ setup_root_file_system() {
         -o Dir::Etc::sourceparts="-" \
         -o APT::Get::List-Cleanup="0"
     sudo -E chroot "$ROOTFSDIR" \
-        /usr/bin/apt-get install -y \
-            --allow-unauthenticated \
-            -o Debug::pkgProblemResolver=yes \
-        $PACKAGES
+        /usr/bin/apt-get ${APT_ARGS} --download-only $PACKAGES
+    [ "clean" = ${CLEANHOSTLEAK} ] && sudo rm -f ${CLEANHOSTLEAK_FILES}
+    sudo -E chroot "$ROOTFSDIR" \
+        /usr/bin/apt-get ${APT_ARGS} $PACKAGES
 }
diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb
index b16e63a..0beb188 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot.bb
+++ b/meta/recipes-devtools/buildchroot/buildchroot.bb
@@ -44,7 +44,8 @@ do_build() {
         mkdir -p $CDIRS
     fi
 
-    setup_root_file_system "${BUILDCHROOT_DIR}" ${BUILDCHROOT_PREINSTALL}
+    setup_root_file_system "${BUILDCHROOT_DIR}" "noclean" \
+        ${BUILDCHROOT_PREINSTALL}
 
     # Install package builder script
     sudo chmod -R a+rw "${BUILDCHROOT_DIR}/home/builder"
-- 
2.16.1