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

hvm: fix startup of HVM without Qubes Tools

Browse Source 
Do not pollute environment of calling process, otherwise all VMs started
from Qubes Manager afterwards will get QREXEC_STARTUP_NOWAIT, which
will cause wait_for_session not working.
This commit is contained in:
Marek Marczykowski-Górecki 2014-04-01 01:07:57 +02:00
parent 2eaf649eed
commit 12d897cd3e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core-modules/01QubesHVm.py
View File

@ -442,7 +442,7 @@ class QubesHVm(QubesVm):
if kwargs.get('verbose', False): if kwargs.get('verbose', False):
print >> sys.stderr, "--> Starting the qrexec daemon..." print >> sys.stderr, "--> Starting the qrexec daemon..."
xid = self.get_xid() xid = self.get_xid()
qrexec_env = os.environ qrexec_env = os.environ.copy()
qrexec_env['QREXEC_STARTUP_NOWAIT'] = '1' qrexec_env['QREXEC_STARTUP_NOWAIT'] = '1'
retcode = subprocess.call ([system_path["qrexec_daemon_path"], str(xid), self.name, self.default_user], env=qrexec_env) retcode = subprocess.call ([system_path["qrexec_daemon_path"], str(xid), self.name, self.default_user], env=qrexec_env)
if (retcode != 0) : if (retcode != 0) :