Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hvm: start guid for HVM without guiagent installed

Browse Source 
This is fix for commit "ebf0a27 hvm: start fullscreen guid only if no
guiagent installed or in debug mode"
This commit is contained in:
Marek Marczykowski-Górecki 2013-12-09 19:10:25 +01:00
parent c249ca761d
commit e4d6be3a4b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core-modules/01QubesHVm.py
View File

@ -337,7 +337,7 @@ class QubesHVm(QubesVm):
def start_guid(self, verbose = True, notify_function = None, def start_guid(self, verbose = True, notify_function = None,
before_qrexec=False, **kwargs): before_qrexec=False, **kwargs):
# If user force the guiagent, start_guid will mimic a standard QubesVM # 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) 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 stubdom_guid_pidfile = '/var/run/qubes/guid-running.%d' % self.stubdom_xid
if os.path.exists(stubdom_guid_pidfile): if os.path.exists(stubdom_guid_pidfile):
@ -346,7 +346,7 @@ class QubesHVm(QubesVm):
os.kill(stubdom_guid_pid, signal.SIGTERM) os.kill(stubdom_guid_pid, signal.SIGTERM)
except Exception as ex: except Exception as ex:
print >> sys.stderr, "WARNING: Failed to kill stubdom gui daemon: %s" % str(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: if verbose:
print >> sys.stderr, "--> Starting Qubes GUId (full screen)..." print >> sys.stderr, "--> Starting Qubes GUId (full screen)..."
self.start_stubdom_guid() self.start_stubdom_guid()