summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-10-17 14:45:50 +0200
committerHolger Levsen <holger@layer-acht.org>2015-10-17 14:45:50 +0200
commita908a7d4ab6aebc571880bb5190c992b977c5812 (patch)
tree41f113898d1137e26fe5202ff10f23e084f057c7
parentc97f95b241524ecc20bfb5b0fac7d1a8914e61b5 (diff)
downloadjenkins.debian.net-a908a7d4ab6aebc571880bb5190c992b977c5812.tar.xz
reproducible arch: use /etc/profile.d/proxy.sh for all bash shells
-rwxr-xr-xbin/reproducible_arch_schroot_setup.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/reproducible_arch_schroot_setup.sh b/bin/reproducible_arch_schroot_setup.sh
index d9a78e3e..6633346e 100755
--- a/bin/reproducible_arch_schroot_setup.sh
+++ b/bin/reproducible_arch_schroot_setup.sh
@@ -79,6 +79,9 @@ tee $SCHROOT_BASE/$TARGET/etc/profile.d/proxy.sh <<-__END__
__END__
chmod 755 $SCHROOT_BASE/$TARGET/etc/profile.d/proxy.sh
+# configure root user to use this for shells and login shells…
+echo ". /etc/profile.d/proxy.sh" | tee -a $SCHROOT_BASE/$TARGET/root/.bashrc
+
# configure pacman
$ROOTCMD pacman-key --init
$ROOTCMD pacman-key --populate archlinux
@@ -93,6 +96,7 @@ echo 'jenkins ALL= NOPASSWD: /usr/sbin/pacman *' | $ROOTCMD tee -a /etc/sudoers
# configure jenkins user
$ROOTCMD mkdir /var/lib/jenkins
$ROOTCMD chown -R jenkins:jenkins /var/lib/jenkins
+echo ". /etc/profile.d/proxy.sh" | tee -a $SCHROOT_BASE/$TARGET/var/lib/jenkins/.bashrc
$USERCMD gpg --check-trustdb # first run will create ~/.gnupg/gpg.conf
$USERCMD gpg --recv-keys 0x091AB856069AAA1C