summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-01-01 22:26:03 +0100
committerHolger Levsen <holger@layer-acht.org>2015-01-01 22:26:03 +0100
commit36eee5d89da4172a9db96cdfa50686bc334bb51e (patch)
treedc10f578209caca2d9ebb162527347fbb7c2d839
parenta0857c5ae47b44f4598a6cda1b1e17d3b3eb5701 (diff)
downloadjenkins.debian.net-36eee5d89da4172a9db96cdfa50686bc334bb51e.tar.xz
live builds: build in /srv/live-build/
-rwxr-xr-xbin/live-build.sh6
-rw-r--r--etc/schroot/default/fstab2
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/live-build.sh b/bin/live-build.sh
index 5a7f62e2..86135829 100755
--- a/bin/live-build.sh
+++ b/bin/live-build.sh
@@ -11,7 +11,7 @@ cleanup_all() {
rm -r $TMPDIR
}
-TMPDIR=$(mktemp --tmpdir=/srv/workspace -d)
+TMPDIR=$(mktemp --tmpdir=/srv/live-build -d)
trap cleanup_all INT TERM EXIT
cd $TMPDIR
@@ -21,10 +21,10 @@ cd $TMPDIR
# FIXME: do debian images too
lb config --distribution jessie --bootappend-live "boot=live config hostname=debian-edu username=debian-edu"
echo education-standalone > config/package-lists/live.list.chroot
-# FIXME add serial console
lb build
ls -la *.iso || true
-cp *.iso /srv/workspace
+mkdir -p /srv/live-build/results
+cp *.iso /srv/live-build/results
# FIXME: use subdir there... (shared with downloaded .isos?)
cleanup_all
diff --git a/etc/schroot/default/fstab b/etc/schroot/default/fstab
index d37ccb83..7f51492b 100644
--- a/etc/schroot/default/fstab
+++ b/etc/schroot/default/fstab
@@ -12,7 +12,7 @@
/srv/reproducible-results /srv/reproducible-results none rw,bind 0 0
/srv/d-i /srv/d-i none rw,bind 0 0
/srv/jenkins /srv/jenkins none rw,bind 0 0
-
+/srv/live-build /srv/live-build none rw,bind 0 0
# It may be desirable to have access to /run, especially if you wish
# to run additional services in the chroot. However, note that this