Properly handle timeout case in lxc-shutdown

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

Properly handle timeout case in lxc-shutdown
495c33c8 · Christian Seiler · Stéphane Graber · 7f145a6d · 495c33c8
Commit 495c33c8 authored Mar 18, 2013 by Christian Seiler Committed by Stéphane Graber Mar 19, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

lxc-shutdown.in src/lxc/lxc-shutdown.in +2 -0

No files found.
--- 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