From c74fda802c5a253b5b2ad12c33ca003761bddcab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Mon, 2 Feb 2015 04:48:42 +0100
Subject: [PATCH] Use tmpfile.d to create /var/run subdirs

This way it will be done much earlier, so qubes-db can be started before
qubes-core.service - which will solve startup dependency loop problem.
---
 linux/aux-tools/fix-dir-perms.sh        | 7 -------
 linux/system-config/Makefile            | 1 +
 linux/system-config/tmpfiles-qubes.conf | 3 +++
 rpm_spec/core-dom0.spec                 | 1 +
 4 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 linux/system-config/tmpfiles-qubes.conf

diff --git a/linux/aux-tools/fix-dir-perms.sh b/linux/aux-tools/fix-dir-perms.sh
index d1ded809..4cac999f 100755
--- a/linux/aux-tools/fix-dir-perms.sh
+++ b/linux/aux-tools/fix-dir-perms.sh
@@ -13,13 +13,6 @@ chgrp qubes /proc/xen/xenbus
 chmod 660 /proc/xen/xenbus
 chgrp qubes /dev/xen/evtchn
 chmod 660 /dev/xen/evtchn
-mkdir -p /var/run/qubes
-chgrp qubes /var/run/qubes
-chmod 770 /var/run/qubes
-touch /var/run/qubes/xl-lock
-chgrp qubes /var/run/qubes/xl-lock
-chmod 660 /var/run/qubes/xl-lock
 chgrp -R qubes /var/log/xen
 chmod -R g+rX /var/log/xen
 chmod g+s /var/log/xen/console
-mkdir -p /var/run/xen-hotplug
diff --git a/linux/system-config/Makefile b/linux/system-config/Makefile
index 3f08e0b5..51536153 100644
--- a/linux/system-config/Makefile
+++ b/linux/system-config/Makefile
@@ -8,3 +8,4 @@ install:
 	ln -s block-snapshot $(DESTDIR)/etc/xen/scripts/block-origin
 	install -d $(DESTDIR)/etc/xdg/autostart
 	install -m 0644 qubes-guid.desktop $(DESTDIR)/etc/xdg/autostart/
+	install -m 0644 -D tmpfiles-qubes.conf $(DESTDIR)/usr/lib/tmpfiles.d/qubes.conf
diff --git a/linux/system-config/tmpfiles-qubes.conf b/linux/system-config/tmpfiles-qubes.conf
new file mode 100644
index 00000000..8ffe6acf
--- /dev/null
+++ b/linux/system-config/tmpfiles-qubes.conf
@@ -0,0 +1,3 @@
+d /var/run/qubes 0770 root qubes
+f /var/run/qubes/xl-lock 0660 root qubes
+d /var/run/xen-hotplug 0755 root root
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index 904e779e..5a615ae8 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -234,6 +234,7 @@ fi
 %attr(2770,root,qubes) %dir /var/lib/qubes/vm-kernels
 /usr/share/qubes/vm-template.xml
 /usr/share/qubes/vm-template-hvm.xml
+/usr/lib/tmpfiles.d/qubes.conf
 /usr/lib/qubes/qubes-prepare-saved-domain.sh
 /usr/lib/qubes/qubes-update-dispvm-savefile-with-progress.sh
 /etc/xen/scripts/block.qubes