From 36eee5d89da4172a9db96cdfa50686bc334bb51e Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 1 Jan 2015 22:26:03 +0100 Subject: live builds: build in /srv/live-build/ --- bin/live-build.sh | 6 +++--- etc/schroot/default/fstab | 2 +- 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 -- cgit v1.2.3-70-g09d2