diff options
| author | kpcyrd <git@rxv.cc> | 2017-11-02 17:18:38 +0100 |
|---|---|---|
| committer | Mattia Rizzolo <mattia@debian.org> | 2017-11-02 17:20:20 +0100 |
| commit | 59f25e6ad14ff0984d7b036945fc5b3c76221abf (patch) | |
| tree | 9b819b4d984ec154123058f424edc8315135af7b | |
| parent | c7429a7e925c43fe845accfd65695a1bdaedf1b2 (diff) | |
| download | jenkins.debian.net-59f25e6ad14ff0984d7b036945fc5b3c76221abf.tar.xz | |
reproducible-archlinux: make pacman fail less early
| -rwxr-xr-x | bin/reproducible_setup_archlinux_schroot.sh | 7 |
1 files changed, 0 insertions, 7 deletions
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 |