From d84d64716bbf273895a140b368f399ed6cb191fa Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Sun, 11 Dec 2011 14:09:46 +0100
Subject: [PATCH] dom0: start guid only when shm.id present

Eg. not during firstboot
---
 dom0/qvm-core/qubes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py
index 0101ef9d..10d54133 100755
--- a/dom0/qvm-core/qubes.py
+++ b/dom0/qvm-core/qubes.py
@@ -1145,7 +1145,7 @@ class QubesVm(object):
                 self.force_shutdown()
                 raise OSError ("ERROR: Cannot execute qrexec_daemon!")
 
-        if subprocess.call('xprop -root >/dev/null 2>&1', shell=True) == 0:
+        if os.path.exists('/var/run/shm.id'):
             self.start_guid(verbose=verbose)
 
         if preparing_dvm: