From e4d6be3a4bab42b253f7f5145b87e1c91ee45986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 9 Dec 2013 19:10:25 +0100 Subject: [PATCH] hvm: start guid for HVM without guiagent installed This is fix for commit "ebf0a27 hvm: start fullscreen guid only if no guiagent installed or in debug mode" --- core-modules/01QubesHVm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core-modules/01QubesHVm.py b/core-modules/01QubesHVm.py index 964353e4..924aac4b 100644 --- a/core-modules/01QubesHVm.py +++ b/core-modules/01QubesHVm.py @@ -337,7 +337,7 @@ class QubesHVm(QubesVm): def start_guid(self, verbose = True, notify_function = None, before_qrexec=False, **kwargs): # If user force the guiagent, start_guid will mimic a standard QubesVM - if self.guiagent_installed and not before_qrexec: + if not before_qrexec and self.guiagent_installed: super(QubesHVm, self).start_guid(verbose, notify_function, extra_guid_args=["-Q"], **kwargs) stubdom_guid_pidfile = '/var/run/qubes/guid-running.%d' % self.stubdom_xid if os.path.exists(stubdom_guid_pidfile): @@ -346,7 +346,7 @@ class QubesHVm(QubesVm): os.kill(stubdom_guid_pid, signal.SIGTERM) except Exception as ex: print >> sys.stderr, "WARNING: Failed to kill stubdom gui daemon: %s" % str(ex) - elif self.debug: + elif before_qrexec and (not self.guiagent_installed or self.debug): if verbose: print >> sys.stderr, "--> Starting Qubes GUId (full screen)..." self.start_stubdom_guid()