From: Christian Seiler <christian@iwakd.de>
Date: Mon, 18 Mar 2013 19:06:31 +0000 (+0100)
Subject: Properly handle timeout case in lxc-shutdown
X-Git-Tag: lxc-0.9.0~1^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=495c33c8e8329c06e64ce6fca54b9a02a384aba3;p=thirdparty%2Flxc.git

Properly handle timeout case in lxc-shutdown

Signed-off-by: Christian Seiler <christian@iwakd.de>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxc-shutdown.in b/src/lxc/lxc-shutdown.in
index fdcade2a4..d82cebf32 100644
--- a/src/lxc/lxc-shutdown.in
+++ b/src/lxc/lxc-shutdown.in
@@ -28,6 +28,7 @@ usage() {
 }
 
 alarm() {
+    trap 'exit 0' TERM
     pid=$1
     timeout=$2
     sleep $timeout
@@ -139,6 +140,7 @@ while ! lxc-info -n $lxc_name --state-is STOPPED; do
 done
 
 if [ $timeout != "-1" ]; then
+    trap - EXIT
     kill $alarmpid
 fi