From d0ec7af010e3363fc6c7f8802d7ad1783c109c4a Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Mon, 10 Oct 2016 20:37:01 +0200
Subject: [PATCH] have a clean bootstrap_tgz each time

---
 zlibs/bootstrap | 44 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/zlibs/bootstrap b/zlibs/bootstrap
index 1a4e1cc..047bb40 100644
--- a/zlibs/bootstrap
+++ b/zlibs/bootstrap
@@ -150,7 +150,19 @@ bootstrap_tar_pack() {
 	req=(bootstrap_tgz)
 	ckreq || return 1
 
-	local _dest=`dirname $bootstrap_tgz`
+	for i in $custmodules; do
+		sed -i -e 's/$i//g' $strapdir/etc/modules
+	done
+
+	cat <<EOF | sudo tee ${strapdir}/prepack ${TEEVERBOSE}
+#!/bin/sh
+apt-get --yes --force-yes purge ${extra_packages}
+EOF
+
+	sudo chmod +x $strapdir/prepack || zerr
+	sudo chroot $strapdir  /prepack || zerr
+
+	local _dest=$(dirname $bootstrap_tgz)
 
 	if [[ -f $bootstrap_tgz ]]; then
 		act "tarball found already in $_dest"
@@ -159,13 +171,11 @@ bootstrap_tar_pack() {
 		silly
 
 		pushd ${strapdir}
-
 		mkdir -p ${_dest}
 		silly
 		sudo tar czf $bootstrap_tgz \
 			--exclude={./boot,./dev,./sys,./proc} \
 			./
-
 		popd
 	fi
 }
@@ -185,4 +195,32 @@ bootstrap_tar_unpack() {
 	silly
 	sudo tar xf $bootstrap_tgz -C ${unpath}
 	sudo mkdir -p ${unpath}/{boot,dev,sys,proc}
+
+	cat <<EOF | sudo tee ${strapdir}/postunpack ${TEEVERBOSE}
+#!/bin/sh
+dpkg-divert --add --local \
+	--divert /usr/sbin/invoke-rc.d.chroot \
+	--rename /usr/sbin/invoke-rc.d
+cp /bin/true /usr/sbin/invoke-rc.d
+echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
+chmod +x /usr/sbin/policy-rc.d
+
+apt-get update
+apt-get --yes --force-yes install ${extra_packages}
+apt-get --yes --force-yes dist-upgrade
+apt-get --yes --force-yes autoremove
+
+apt-get clean
+
+rm -f /usr/sbin/policy-rc.d
+rm -f /usr/sbin/invoke-rc.d
+dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
+EOF
+
+	sudo chmod +x $strapdir/postunpack || zerr
+	sudo chroot $strapdir  /postunpack || zerr
+
+	for i in $custmodules; do
+		print $i | sudo tee -a $strapdir/etc/modules ${TEEVERBOSE}
+	done
 }