From 4303b7dc52d1e4b2edacb5056b6da146cb7dc4a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 4 Mar 2015 02:08:22 +0100
Subject: [PATCH] dispvm: use qubes.WaitForSession to wait for gui-agent
 startup

---
 vm-systemd/prepare-dvm.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/vm-systemd/prepare-dvm.sh b/vm-systemd/prepare-dvm.sh
index ac1022f..a8d0c07 100755
--- a/vm-systemd/prepare-dvm.sh
+++ b/vm-systemd/prepare-dvm.sh
@@ -6,15 +6,11 @@ possibly_run_save_script()
 	if [ -z "$ENCODED_SCRIPT" ] ; then return ; fi
 	echo $ENCODED_SCRIPT|perl -e 'use MIME::Base64 qw(decode_base64); local($/) = undef;print decode_base64(<STDIN>)' >/tmp/qubes-save-script
 	chmod 755 /tmp/qubes-save-script
-	while ! [ -S /tmp/.X11-unix/X0 ]; do sleep 0.5; done
 	DISPLAY=:0 su - user -c /tmp/qubes-save-script
 }
 
 if true; then
-    systemctl --ignore-dependencies start qubes-gui-agent.service
-    while ! xenstore-read qubes-save-request 2>/dev/null ; do
-        usleep 10
-    done
+    echo user | /bin/sh /etc/qubes-rpc/qubes.WaitForSession
     possibly_run_save_script
     umount /rw
     dmesg -c >/dev/null