From 59f25e6ad14ff0984d7b036945fc5b3c76221abf Mon Sep 17 00:00:00 2001 From: kpcyrd Date: Thu, 2 Nov 2017 17:18:38 +0100 Subject: reproducible-archlinux: make pacman fail less early --- bin/reproducible_setup_archlinux_schroot.sh | 7 ------- 1 file changed, 7 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 7b934a47..bdd31f23 100755 --- a/bin/reproducible_setup_archlinux_schroot.sh +++ b/bin/reproducible_setup_archlinux_schroot.sh @@ -93,13 +93,6 @@ 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 - # 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 $ROOTCMD bash -l -c 'pacman-key --init' $ROOTCMD bash -l -c 'pacman-key --populate archlinux' # use a specific mirror -- cgit v1.2.3-54-g00ecf