[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] d-i: fixup last commits, copying code is hard

[Holger Levsen]

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


Commits:
2ba6e4f8 by Holger Levsen at 2018-10-15T15:35:32Z
d-i: fixup last commits, copying code is hard

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

- - - - -


2 changed files:

- bin/d-i_build.sh
- bin/d-i_manual.sh


Changes:

=====================================
bin/d-i_build.sh
=====================================
@@ -112,17 +112,23 @@ pdebuild_package() {
 	#
 	# use host apt proxy configuration for pbuilder too
 	if [ ! -z "$http_proxy" ] ; then
-		echo "echo '$(cat /etc/apt/apt.conf.d/80proxy)' > /etc/apt/apt.conf.d/80proxy" >> ${TMPFILE}
 		pbuilder_http_proxy="--http-proxy $http_proxy"
 	fi
-	# setup base.tgz
+	# prepare setting up base.tgz
 	if [ ! -f /var/cache/pbuilder/base.tgz ] ; then
 		sudo pbuilder --create $pbuilder_http_proxy
 		TMPFILE=$(mktemp)
 		cat >> $TMPFILE <<- EOF
 # Preseeding man-db/auto-update to false
 echo "man-db man-db/auto-update boolean false" | debconf-set-selections
+echo "Configuring dpkg to not fsync()"
+echo "force-unsafe-io" > /etc/dpkg/dpkg.cfg.d/02speedup
 EOF
+		# using host apt proxy settings too
+		if [ ! -z "$http_proxy" ] ; then
+			echo "echo '$(cat /etc/apt/apt.conf.d/80proxy)' > /etc/apt/apt.conf.d/80proxy" >> ${TMPFILE}
+		fi
+		#
 		sudo pbuilder --execute $pbuilder_http_proxy --save-after-exec -- ${TMPFILE}
 		rm ${TMPFILE}
 	else


=====================================
bin/d-i_manual.sh
=====================================
@@ -40,17 +40,23 @@ pdebuild_package() {
 	#
 	# use host apt proxy configuration for pbuilder too
 	if [ ! -z "$http_proxy" ] ; then
-		echo "echo '$(cat /etc/apt/apt.conf.d/80proxy)' > /etc/apt/apt.conf.d/80proxy" >> ${TMPFILE}
 		pbuilder_http_proxy="--http-proxy $http_proxy"
 	fi
-	# setup base.tgz
+	# prepare setting up base.tgz
 	if [ ! -f /var/cache/pbuilder/base.tgz ] ; then
 		sudo pbuilder --create $pbuilder_http_proxy
 		TMPFILE=$(mktemp)
 		cat >> $TMPFILE <<- EOF
 # Preseeding man-db/auto-update to false
 echo "man-db man-db/auto-update boolean false" | debconf-set-selections
+echo "Configuring dpkg to not fsync()"
+echo "force-unsafe-io" > /etc/dpkg/dpkg.cfg.d/02speedup
 EOF
+		# using host apt proxy settings too
+		if [ ! -z "$http_proxy" ] ; then
+			echo "echo '$(cat /etc/apt/apt.conf.d/80proxy)' > /etc/apt/apt.conf.d/80proxy" >> ${TMPFILE}
+		fi
+		#
 		sudo pbuilder --execute $pbuilder_http_proxy --save-after-exec -- ${TMPFILE}
 		rm ${TMPFILE}
 	else



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/2ba6e4f8f68e104b9927df8b6bafe750328c6f9d

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/commit/2ba6e4f8f68e104b9927df8b6bafe750328c6f9d
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/20181015/5f27cafe/attachment-0001.html>