summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2014-04-27 21:04:36 +0200
committerHolger Levsen <holger@layer-acht.org>2014-04-27 21:04:36 +0200
commitd39fe92a7c8b67aeb10c724090269f1b5237c76e (patch)
treec4412d7f8a909d408978bc2e51c8cc1d62010d77 /bin
parentd1c2ca4e71d3a72867dc1ac3bba579beead624a5 (diff)
downloadjenkins.debian.net-d39fe92a7c8b67aeb10c724090269f1b5237c76e.tar.xz
fixup job shells too (see previous commit) and thus switch to --directory...
Diffstat (limited to 'bin')
-rwxr-xr-xbin/schroot-create.sh10
1 files changed, 2 insertions, 8 deletions
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index 6fff0c49..fca04f43 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -40,8 +40,6 @@ if [ -z "$CHROOT_TARGET" ]; then
exit 1
fi
-export CURDIR=$(pwd)
-
bootstrap() {
mkdir -p "$CHROOT_TARGET/etc/dpkg/dpkg.cfg.d"
echo force-unsafe-io > "$CHROOT_TARGET/etc/dpkg/dpkg.cfg.d/02dpkg-unsafe-io"
@@ -93,12 +91,8 @@ sudo tee /etc/schroot/chroot.d/jenkins-"$TARGET" <<-__END__
union-type=aufs
__END__
-cd /tmp
-
-schroot -c "source:jenkins-$TARGET" -u root -- apt-get update
+schroot --directory /root -c "source:jenkins-$TARGET" -u root -- apt-get update
if [ -n "$1" ]
then
- schroot -c "source:jenkins-$TARGET" -u root -- apt-get install -y --no-install-recommends "$@"
+ schroot --directory /root -c "source:jenkins-$TARGET" -u root -- apt-get install -y --no-install-recommends "$@"
fi
-
-cd $CURDIR