From 79d177c9f73a2f4151c75f72b966cfc3776f05d5 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 12 Feb 2016 02:11:08 +0100
Subject: reproducible archlinux: remove YOLO workarounds

---
 bin/reproducible_setup_archlinux_schroot.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'bin/reproducible_setup_archlinux_schroot.sh')

diff --git a/bin/reproducible_setup_archlinux_schroot.sh b/bin/reproducible_setup_archlinux_schroot.sh
index 660f1c2b..051ec089 100755
--- a/bin/reproducible_setup_archlinux_schroot.sh
+++ b/bin/reproducible_setup_archlinux_schroot.sh
@@ -56,7 +56,7 @@ cleanup() {
 	rm -f $TMPLOG
 }
 
-SCHROOT_TARGET=$(mktemp -d -p $SCHROOT_BASE/ schroot-install-$TARGET-XXXX)
+#SCHROOT_TARGET=$(mktemp -d -p $SCHROOT_BASE/ schroot-install-$TARGET-XXXX)
 trap cleanup INT TERM EXIT
 TARGET=reproducible-archlinux
 bootstrap
@@ -81,13 +81,13 @@ chmod 755 $SCHROOT_BASE/$TARGET/etc/profile.d/proxy.sh
 echo ". /etc/profile.d/proxy.sh" | tee -a $SCHROOT_BASE/$TARGET/root/.bashrc
 
 # configure pacman
-if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] ; then
+#if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] ; then
 	# YOLO! https://bugs.archlinux.org/task/45351 is where we got the workaround from…
 	# the real question however is: why on earth does this work on the jenkins node, but not on pb-build3
 	# pacman starts gpg, gpg starts gpg-agent and gpg-agent is killed when the shells ends.
 	# this works nicely on one host, but not on the other. let's see how this works without gpg-agent at all…
-	sed -i -s "s#no-permission-warning#no-permission-warning --no-autostart#g" $SCHROOT_BASE/$TARGET/usr/bin/pacman-key
-fi
+#	sed -i -s "s#no-permission-warning#no-permission-warning --no-autostart#g" $SCHROOT_BASE/$TARGET/usr/bin/pacman-key
+#fi
 $ROOTCMD bash -l -c 'pacman-key --init'
 $ROOTCMD bash -l -c 'pacman-key --populate archlinux'
 # use a specific mirror
@@ -108,10 +108,10 @@ $ROOTCMD chown -R jenkins:jenkins /var/lib/jenkins
 echo ". /etc/profile.d/proxy.sh" | tee -a $SCHROOT_BASE/$TARGET/var/lib/jenkins/.bashrc
 $USERCMD bash -l -c 'gpg --check-trustdb' # first run will create ~/.gnupg/gpg.conf
 echo "keyserver-options auto-key-retrieve" | tee -a $SCHROOT_BASE/$TARGET/var/lib/jenkins/.gnupg/gpg.conf
-if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] ; then
-	# YOLO, see YOLO comment above
-	echo "no-autostart" | tee -a $SCHROOT_BASE/$TARGET/var/lib/jenkins/.gnupg/gpg.conf
-fi
+#if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] ; then
+#	# YOLO, see YOLO comment above
+#	echo "no-autostart" | tee -a $SCHROOT_BASE/$TARGET/var/lib/jenkins/.gnupg/gpg.conf
+#fi
 $USERCMD bash -l -c 'gpg --recv-keys 0x091AB856069AAA1C'
 
 echo "schroot $TARGET set up successfully in $SCHROOT_BASE/$TARGET - exiting now."
-- 
cgit v1.2.3-54-g00ecf