From 54e094e0ba2ac0e6f549433a759c551f28b0b89b Mon Sep 17 00:00:00 2001
From: Bill Peck <bpeck@redhat.com>
Date: Fri, 12 Sep 2014 10:49:43 -0400
Subject: Fix return2beaker.sh

---
 distribution/reservesys/reservesys.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/distribution/reservesys/reservesys.sh b/distribution/reservesys/reservesys.sh
index 489a78c..24d45bb 100755
--- a/distribution/reservesys/reservesys.sh
+++ b/distribution/reservesys/reservesys.sh
@@ -5,7 +5,12 @@
 # If we timeout from either local or external watchdog
 # we will have a warn/fail recorded anyway.
 #
-trap 'exit 0' 15
+
+cleanup()
+{
+    kill -9 $1
+    exit 0
+}
 
 # Functions
 RprtRslt()
@@ -213,8 +218,10 @@ fi
 # Run another copy of restraint on a different port
 # This makes it easy to develop/debug new tasks.
 
-restraintd --port 8082
+restraintd --port 8082 &
+pid=$!
 
+trap "cleanup $pid" 15
 
 # We stay running in restraint..
 while (true); do
-- 
cgit