From a2ef7ac3bc1acd5beab81dff05f66fc348feaf2f Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Mon, 3 Dec 2012 18:46:42 +0100
Subject: try harder to end successfully

---
 bin/cd_tester.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin/cd_tester.sh')

diff --git a/bin/cd_tester.sh b/bin/cd_tester.sh
index 7aed97e9..a3692c62 100755
--- a/bin/cd_tester.sh
+++ b/bin/cd_tester.sh
@@ -48,6 +48,7 @@ RESULTS=$WORKSPACE/results
 
 cleanup_all() {
 	set +x
+	set +e
 	cd $RESULTS
 	echo -n "Last screenshot: "
 	(ls -t1 snapshot* | head -1) || true
@@ -60,7 +61,7 @@ cleanup_all() {
 	#
 	# kill qemu and image
 	#
-	sudo kill -9 $(ps fax | grep -v grep | grep -v sudo | grep qemu-system | grep ${NAME}-preseed.cfg 2>/dev/null | cut -d " " -f1)
+	sudo kill -9 $(ps fax | grep -v grep | grep -v sudo | grep qemu-system | grep ${NAME}-preseed.cfg 2>/dev/null | cut -d " " -f1) || true
 	sleep 0.3s
 	rm $WORKSPACE/$NAME.qcow
 	#
-- 
cgit v1.2.3-70-g09d2