[lxc-devel] [PATCH 2/2] Properly handle timeout case in lxc-shutdown
Christian Seiler
christian at iwakd.de
Mon Mar 18 19:06:31 UTC 2013
Signed-off-by: Christian Seiler <christian at iwakd.de>
---
src/lxc/lxc-shutdown.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lxc/lxc-shutdown.in b/src/lxc/lxc-shutdown.in
index fdcade2..d82cebf 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
--
1.7.10.4
More information about the lxc-devel
mailing list