From e209e448f2f1679638f9745705c6526a6572dd92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Tue, 5 Dec 2017 03:59:34 +0100
Subject: [PATCH] Fix script for DispVM cleanup

Cleanup DispVMs after non-clean shutdown

Fixes QubesOS/qubes-issues#3037
---
 linux/aux-tools/cleanup-dispvms | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/linux/aux-tools/cleanup-dispvms b/linux/aux-tools/cleanup-dispvms
index 7123e2fb..be266c03 100755
--- a/linux/aux-tools/cleanup-dispvms
+++ b/linux/aux-tools/cleanup-dispvms
@@ -1,16 +1,12 @@
 #!/usr/bin/python
 
-from qubes.qubes import QubesVmCollection
+from qubesadmin import Qubes
 
 def main():
-    qvm_collection = QubesVmCollection()
-    qvm_collection.lock_db_for_writing()
-    qvm_collection.load()
-    for vm in qvm_collection.values():
-        if vm.is_disposablevm() and not vm.is_running():
-            qvm_collection.pop(vm.qid)
-    qvm_collection.save()
-    qvm_collection.unlock_db()
-
+    app = Qubes()
+    for vm in app.domains:
+        if vm.klass == 'DispVM' and not vm.is_running():
+            if vm.auto_cleanup:
+                del app.domains[vm]
 
 main()