From fbf4c93730ae8e07f5b974c68ddedf6724e0d815 Mon Sep 17 00:00:00 2001
From: Rusty Bird <rustybird@openmailbox.org>
Date: Fri, 1 Jul 2016 16:01:47 +0000
Subject: [PATCH] dvm, then xendriverdomain, then qrexec-agent

Fixes QubesOS/qubes-issues#2126
Fixes QubesOS/qubes-issues#1990
---
 vm-systemd/qubes-dvm.service          | 1 +
 vm-systemd/qubes-qrexec-agent.service | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/vm-systemd/qubes-dvm.service b/vm-systemd/qubes-dvm.service
index 84a6bdd..294eba3 100644
--- a/vm-systemd/qubes-dvm.service
+++ b/vm-systemd/qubes-dvm.service
@@ -2,6 +2,7 @@
 Description=Prepare Qubes DispVM Template
 ConditionPathExists=/var/run/qubes-service/qubes-dvm
 After=systemd-readahead-replay.service
+Before=xendriverdomain.service
 
 [Service]
 Type=oneshot
diff --git a/vm-systemd/qubes-qrexec-agent.service b/vm-systemd/qubes-qrexec-agent.service
index 38d8f71..99a50d0 100644
--- a/vm-systemd/qubes-qrexec-agent.service
+++ b/vm-systemd/qubes-qrexec-agent.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Qubes remote exec agent
-After=qubes-dvm.service
+After=qubes-dvm.service xendriverdomain.service
 
 [Service]
 ExecStartPre=/bin/sh -c '[ -e /dev/xen/evtchn ] || modprobe xen_evtchn'