From 8ba2b964d78810e760012bc20be08050000b0d32 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sun, 4 Oct 2020 16:24:47 +0300
Subject: fix remove-vm

---
 remove-vm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/remove-vm b/remove-vm
index d7e9b2a..67a078d 100755
--- a/remove-vm
+++ b/remove-vm
@@ -4,14 +4,23 @@ set -eu -o pipefail
 
 running()
 {
-    virsh domid "$1" > /dev/null
+    virsh domstate "$1" | grep -q -Fx running
+}
+
+shutoff()
+{
+    virsh domstate "$1" | grep -q -Fx "shut off"
 }
 
 for vm in "$@"
 do
     if running "$vm"
     then
-	virsh destroy "$vm" > /dev/null
+	virsh shutdown "$vm" > /dev/null
+	while ! shutoff "$vm"
+	do
+	    sleep 1
+	done
     fi
     virsh undefine "$vm" > /dev/null
 done
-- 
cgit v1.2.1