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

core/HVM: always start qrexec daemon

Browse Source 
If not marked as installed, start it in background - waiting for
possible Qubes Tools installation. If that happens, make it possible to
tell the dom0 about that fact.
This commit is contained in:
Marek Marczykowski-Górecki 2013-10-28 05:08:28 +01:00
parent 3df9719972
commit 495a24a2e7
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core-modules/01QubesHVm.py
View File

@ -261,7 +261,17 @@ class QubesHVm(QubesVm):
raise QubesException("Cannot start qubes-guid!")
def start_qrexec_daemon(self, **kwargs):
if self.qrexec_installed:
if not self.qrexec_installed:
if kwargs.get('verbose', False):
print >> sys.stderr, "--> Starting the qrexec daemon..."
xid = self.get_xid()
qrexec_env = os.environ
qrexec_env['QREXEC_STARTUP_NOWAIT'] = '1'
retcode = subprocess.call ([system_path["qrexec_daemon_path"], str(xid), self.name, self.default_user], env=qrexec_env)
if (retcode != 0) :
self.force_shutdown(xid=xid)
raise OSError ("ERROR: Cannot execute qrexec-daemon!")
else:
super(QubesHVm, self).start_qrexec_daemon(**kwargs)
if self._start_guid_first: