ensure cleanup of build directory

Signed-off-by: Christoph Willing <chris.willing@iinet.net.au>

Author: Christoph Willing

Makefile

@@ -4,6 +4,7 @@ SOURCES = \
 	spbuilder \
 	spbuilder-1402.conf \
 	spbuilder.build \
+	spbuilder.stop \
 	spbuilder.create.in \
 	spbuilder.update.in \
 	spbuilder.wrapper.in \
@@ -32,6 +33,7 @@ install: build man
 	install -m 0755 spbuilder-1402.conf $(DESTDIR)/etc/spbuilder
 	install -m 0755 -T spbuilderrc.default $(DESTDIR)/etc/spbuilder/spbuilderrc
 	install -m 0755 spbuilder.build $(DESTDIR)/usr/share/spbuilder
+	install -m 0755 spbuilder.stop $(DESTDIR)/usr/share/spbuilder
 	install -m 0755 spbuilder.create.in $(DESTDIR)/usr/share/spbuilder
 	install -m 0755 spbuilder.update.in $(DESTDIR)/usr/share/spbuilder
 	install -m 0755 spbuilder.wrapper.in $(DESTDIR)/usr/share/spbuilder

spbuilder

@@ -230,6 +230,8 @@ lxc.mount.entry = $SPBUILDER_SLACKBUILDS mnt/slackbuilds none bind,ro,create=dir
 lxc.mount.entry = $SPBUILDER_BASE var/cache/spbuilder none bind,create=dir 0 0\n\
 &:" ${lxc_base_dir}/${SPBUILDER_MASTER_NAME}/config
 
+    echo "lxc.hook.stop = /usr/share/spbuilder/spbuilder.stop" >> ${lxc_base_dir}/${SPBUILDER_MASTER_NAME}/config
+
     # Setup hoorex
     SPB_WRAPPER=$(tempfile)
     sed -e "s/%SPB_SHUTDOWN%/$SPB_SHUTDOWN/" ${SPBUILDER_DATA_DIR}/spbuilder.create.in >$SPB_WRAPPER
@@ -309,11 +311,17 @@ function build_package ()
         exit 3
     fi
 
-    lxc-copy -n $SPBUILDER_MASTER_NAME -N $our_name -B overlayfs -s
+    env build_jobname=${SPBUILDER_BASE}/build/$(basename $source_location) \
+    lxc-copy \
+	--name $SPBUILDER_MASTER_NAME \
+	--newname=$our_name \
+	-B overlayfs \
+	--ephemeral
+	# -e|--ephemeral implies --snapshot
     echo "Created snapshot: $our_name"
     SPB_WRAPPER=$(tempfile)
     sed -e "s/%SPB_SHUTDOWN%/$SPB_SHUTDOWN/" ${SPBUILDER_DATA_DIR}/spbuilder.wrapper.in >$SPB_WRAPPER
-    lxc-start -n $our_name
+    # -e|--ephemeral already starts the copied container lxc-start -n $our_name
     lxc-wait -n $our_name -s RUNNING
     lxc-attach -n $our_name -a $ARCH -- touch /usr/bin/spbuilder.build /usr/bin/spbuilder.wrapper
     cp ${SPBUILDER_DATA_DIR}/spbuilder.build ${lxc_base_dir}/${our_name}/delta0/usr/bin/spbuilder.build

spbuilder.stop

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+
+env > /tmp/.spbuilder
+echo >> /tmp/.spbuilder
+echo "build_jobname = $build_jobname" >> /tmp/.spbuilder
+
+
+# Normally, the SPB building directory is cleaned up elsewhere,
+# however an interruption & manual shutdown would leave it.
+# Therefore try removing it here as a last resort.
+if [ -d $build_jobname  -a "$build_jobname" != "/" ]; then
+    rm -rf $build_jobname
+fi