From e0fcbd3498b16444d09512470fb7428a82701170 Mon Sep 17 00:00:00 2001
From: Rusty Bird <rustybird@net-c.com>
Date: Mon, 15 Feb 2021 14:10:39 +0000
Subject: [PATCH] Drop obsolete core2 dvmdata/ and servicevms/ directories

---
 Makefile                    | 2 --
 qubes/tests/storage_file.py | 1 -
 rpm_spec/core-dom0.spec.in  | 2 --
 3 files changed, 5 deletions(-)

diff --git a/Makefile b/Makefile
index be880645..034bd544 100644
--- a/Makefile
+++ b/Makefile
@@ -222,10 +222,8 @@ endif
 	mkdir -p $(DESTDIR)$(DATADIR)
 	mkdir -p $(DESTDIR)$(DATADIR)/vm-templates
 	mkdir -p $(DESTDIR)$(DATADIR)/appvms
-	mkdir -p $(DESTDIR)$(DATADIR)/servicevms
 	mkdir -p $(DESTDIR)$(DATADIR)/vm-kernels
 	mkdir -p $(DESTDIR)$(DATADIR)/backup
-	mkdir -p $(DESTDIR)$(DATADIR)/dvmdata
 	mkdir -p $(DESTDIR)$(STATEDIR)
 	mkdir -p $(DESTDIR)$(LOGDIR)
 
diff --git a/qubes/tests/storage_file.py b/qubes/tests/storage_file.py
index 1ab36c6c..b0404f23 100644
--- a/qubes/tests/storage_file.py
+++ b/qubes/tests/storage_file.py
@@ -494,7 +494,6 @@ class TC_03_FilePool(qubes.tests.QubesTestCase):
     POOL_DIR = '/tmp/test-pool'
     APPVMS_DIR = '/tmp/test-pool/appvms'
     TEMPLATES_DIR = '/tmp/test-pool/vm-templates'
-    SERVICE_DIR = '/tmp/test-pool/servicevms'
     POOL_NAME = 'test-pool'
     POOL_CONFIG = {'driver': 'file', 'dir_path': POOL_DIR, 'name': POOL_NAME}
 
diff --git a/rpm_spec/core-dom0.spec.in b/rpm_spec/core-dom0.spec.in
index 979b2bfa..76e7dcb4 100644
--- a/rpm_spec/core-dom0.spec.in
+++ b/rpm_spec/core-dom0.spec.in
@@ -524,9 +524,7 @@ done
 %attr(2770,root,qubes) %dir /var/lib/qubes
 %attr(2770,root,qubes) %dir /var/lib/qubes/vm-templates
 %attr(2770,root,qubes) %dir /var/lib/qubes/appvms
-%attr(2770,root,qubes) %dir /var/lib/qubes/servicevms
 %attr(2770,root,qubes) %dir /var/lib/qubes/backup
-%attr(2770,root,qubes) %dir /var/lib/qubes/dvmdata
 %attr(2770,root,qubes) %dir /var/lib/qubes/vm-kernels
 /usr/share/qubes/templates/libvirt/xen.xml
 /usr/share/qubes/templates/libvirt/devices/block.xml