--- xen0        2009-03-04 10:08:39.000000000 -0700
+++ xen0.new    2009-04-14 16:12:36.000000000 -0600
@@ -16,6 +16,7 @@
 STOP_COMMAND="xm destroy"
 START_COMMAND="xm create"
 DUMP_COMMAND="xm dump-core"
+CHECK_COMMAND="xm list | grep"
 DEFAULT_XEN_DIR="/etc/xen"
 SSH_COMMAND="/usr/bin/ssh -q -x -n"

@@ -82,20 +83,26 @@

         case $2 in
             stop)
-                 kill_node=`$SSH_COMMAND $dom0 "grep ^[[:space:]]*name $cfg" | cut -f 2 -d '=' |  sed -e 's,",,g'`
-                 if [ "x" = "x$kill_node" ]
-                 then
-                     echo "Couldn't find a node name to stop"
-                     exit 1
-                 fi
-
-                 if [ "x$run_dump" != "x" ]
-                 then
-                     #Need to run core dump
-                     $SSH_COMMAND $dom0 "$DUMP_COMMAND $kill_node >/dev/null 2>&1"
-                 fi
-
-                 $SSH_COMMAND $dom0 "(sleep 2; $STOP_COMMAND $kill_node) >/dev/null 2>&1 &"
+                kill_node=`$SSH_COMMAND $dom0 "grep ^[[:space:]]*name $cfg" | cut -f 2 -d '=' |  sed -e 's,",,g'`
+                if [ "x" = "x$kill_node" ]
+                then
+                    echo "Couldn't find a node name to stop"
+                    exit 1
+                fi
+
+                if [ "x$run_dump" != "x" ]
+                then
+                    #Need to run core dump
+                    $SSH_COMMAND $dom0 "$DUMP_COMMAND $kill_node >/dev/null 2>&1"
+                fi
+
+                $SSH_COMMAND $dom0 "(sleep 2; $STOP_COMMAND $kill_node) >/dev/null 2>&1 &"
+                if $SSH_COMMAND $dom0 "(sleep 2; ${CHECK_COMMAND} ^$kill_node) >/dev/null 2>&1"
+                then
+                   #Dom0 wasn't able to destroy DomU
+                   echo "xm destroy failed. $kill_node is still active"
+                   exit 1
+                fi
                 break;;
             start)
                 $SSH_COMMAND $dom0 "(sleep 2; $START_COMMAND $cfg) >/dev/null 2>&1 &"