From: Dwight Engen <dwight.engen@oracle.com>
Date: Tue, 18 Dec 2012 21:12:34 +0000 (-0500)
Subject: lxc-destroy container only if it is in the STOPPED state
X-Git-Tag: lxc-0.9.0.alpha3~1^2~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=963aef6f7f127c43cded0fe628a1b00fe9afb16e;p=thirdparty%2Flxc.git

lxc-destroy container only if it is in the STOPPED state

Currently, lxc-destory will attempt to destroy a container if it is not in
the RUNNING state, but doing so is not good when the container is FROZEN, or
in other transitional states.

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxc-destroy.in b/src/lxc/lxc-destroy.in
index c72f18a33..152749574 100644
--- a/src/lxc/lxc-destroy.in
+++ b/src/lxc/lxc-destroy.in
@@ -94,14 +94,14 @@ if [ ! -d "$lxc_path/$lxc_name" ]; then
     exit 1
 fi
 
-# make sure the container isn't running
-lxc-info -n $lxc_name 2>/dev/null | grep -q RUNNING
-if [ $? -eq 0 ]; then
+# make sure the container is stopped
+state=`lxc-info -n $lxc_name 2>/dev/null | head -1 |awk '{print $2}'`
+if [ $state != "STOPPED" ]; then
     if [ $force -eq 1 ]; then
         lxc-stop -n $lxc_name
         lxc-wait -n $lxc_name -s STOPPED
     else
-        echo "$(basename $0): '$lxc_name' is running; aborted" >&2
+        echo "$(basename $0): '$lxc_name' is $state; aborted" >&2
         exit 1
     fi
 fi