[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] fixup 6ce1a757: chroot-installs: mmdebstrap expects an empty dir (fixup cab70212)

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
13ff75d6 by Holger Levsen at 2020-01-14T18:20:25+01:00
fixup 6ce1a757: chroot-installs: mmdebstrap expects an empty dir (fixup cab70212)

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


1 changed file:

- bin/chroot-installation.sh


Changes:

=====================================
bin/chroot-installation.sh
=====================================
@@ -100,6 +100,9 @@ echo "deb-src $MIRROR $1 main" > /etc/apt/sources.list.d/$1-src.list
 apt-get update
 # Preseeding man-db/auto-update to false
 echo "man-db man-db/auto-update boolean false" | debconf-set-selections
+# configure dpkg to use unsafe io for faster installs
+mkdir -p /etc/dpkg/dpkg.cfg.d
+echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/02dpkg-unsafe-io
 set +x
 EOF
 }
@@ -166,8 +169,6 @@ bootstrap() {
 	set -x
 	sudo mmdebstrap $1 $CHROOT_TARGET $MIRROR
 	set +x
-	mkdir -p "$CHROOT_TARGET/etc/dpkg/dpkg.cfg.d"
-	echo force-unsafe-io > "$CHROOT_TARGET/etc/dpkg/dpkg.cfg.d/02dpkg-unsafe-io"
 	prepare_bootstrap $1
 	execute_ctmpfile
 }



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/13ff75d694f9576bb08a30cf141599f11917acb8

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/13ff75d694f9576bb08a30cf141599f11917acb8
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20200114/dfda4917/attachment-0001.html>