From 06a0d30d50ce4ea266532c06ef24880bf5363c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 24 Jan 2014 06:46:18 +0100
Subject: [PATCH] dispvm: start gui agent early, do not kill Xorg

Now gui agent support reconnecting to guid.
---
 vm-systemd/prepare-dvm.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/vm-systemd/prepare-dvm.sh b/vm-systemd/prepare-dvm.sh
index ffa25fe..f59f06b 100755
--- a/vm-systemd/prepare-dvm.sh
+++ b/vm-systemd/prepare-dvm.sh
@@ -6,19 +6,21 @@ 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
-	Xorg -config /etc/X11/xorg-preload-apps.conf :0 &
 	while ! [ -S /tmp/.X11-unix/X0 ]; do sleep 0.5; done
 	DISPLAY=:0 su - user -c /tmp/qubes-save-script
-	killall Xorg Xorg.bin
 }
 
-if qubesdb-read /qubes-save-request 2>/dev/null ; then
+if true; then
     if [ -L /home ]; then
         rm /home
         mkdir /home
     fi
     mount --bind /home_volatile /home
     touch /etc/this-is-dvm
+    systemctl --ignore-dependencies start qubes-gui-agent.service
+    while ! xenstore-read qubes-save-request 2>/dev/null ; do
+        usleep 10
+    done
     mount /rw
     possibly_run_save_script
     umount /rw