From 6c2b9fd638111d92d416a90da934a0a3ac7798d5 Mon Sep 17 00:00:00 2001
From: Rusty Bird <rustybird@net-c.com>
Date: Sun, 14 Jan 2018 19:21:01 +0000
Subject: [PATCH] qvm-run-vm: wait for X11 in DispVM case

qvm-run-vm cannot make a separate qubes.WaitForSession call for a
DispVM. Instead, pass the new WaitForSession argument to qubes.VMShell,
which will do the equivalent.
---
 qubes-rpc/qvm-run-vm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/qubes-rpc/qvm-run-vm b/qubes-rpc/qvm-run-vm
index 1dbbe44..710d2bb 100755
--- a/qubes-rpc/qvm-run-vm
+++ b/qubes-rpc/qvm-run-vm
@@ -49,4 +49,10 @@ elif [ "$VMNAME" = "" ] ; then
     print_usage
     exit 1
 fi
-exec /usr/lib/qubes/qrexec-client-vm "$VMNAME" qubes.VMShell "/usr/lib/qubes/qrun-in-vm" "$@"
+
+service="qubes.VMShell"
+case "$VMNAME" in \$dispvm|\$dispvm:*)
+    service="$service+WaitForSession"
+esac
+
+exec /usr/lib/qubes/qrexec-client-vm "$VMNAME" "$service" "/usr/lib/qubes/qrun-in-vm" "$@"