commit 33d5029041a3f5678f759ac7eda29b9aff99b13a
author Anthony Young <sleepsonthefloor@gmail.com> Wed Jan 04 09:32:48 2012 -0800
committer Anthony Young <sleepsonthefloor@gmail.com> Wed Jan 04 17:04:15 2012 -0800
tree a18e6cc23ffe862ee53a21ed5150dd4b20fd5cd5
parent 7966a5356db8c7a01fe8d49ec88c7c99b0af6f3f

Better domain parsing and improved instance cleanup

 * Fixes bug 911506
 * Fix typo - logical or not pipe

Change-Id: Id92a7e1d7e974710635899d43a7d428ce525227c

stack.sh

diff --git a/stack.sh b/stack.sh
index e1b005e..f3477cd 100755
--- a/stack.sh
+++ b/stack.sh
@@ -843,10 +843,10 @@
     clean_iptables
 
     # Destroy old instances
-    instances=`virsh list | grep $INSTANCE_NAME_PREFIX | cut -d " " -f3`
+    instances=`virsh list --all | grep $INSTANCE_NAME_PREFIX | sed "s/.*\($INSTANCE_NAME_PREFIX[0-9a-fA-F]*\).*/\1/g"`
     if [ ! $instances = "" ]; then
-        echo $instances | xargs -n1 virsh destroy
-        echo $instances | xargs -n1 virsh undefine
+        echo $instances | xargs -n1 virsh destroy || true
+        echo $instances | xargs -n1 virsh undefine || true
     fi
 
     # Clean out the instances directory.