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

core: really quiet mode if vm.start()

Browse Source 
Pass '-q' option to gui-daemon and qrexec-daemon.
This commit is contained in:
Marek Marczykowski-Górecki 2014-10-25 01:45:01 +02:00
parent 247cff335f
commit aa958eeff6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core-modules/000QubesVm.py
View File

@ -1651,6 +1651,8 @@ class QubesVm(object):
guid_cmd += extra_guid_args guid_cmd += extra_guid_args
if self.debug: if self.debug:
guid_cmd += ['-v', '-v'] guid_cmd += ['-v', '-v']
elif not verbose:
guid_cmd += ['-q']
retcode = subprocess.call (guid_cmd) retcode = subprocess.call (guid_cmd)
if (retcode != 0) : if (retcode != 0) :
raise QubesException("Cannot start qubes-guid!") raise QubesException("Cannot start qubes-guid!")
@ -1672,9 +1674,13 @@ class QubesVm(object):
if verbose: if verbose:
print >> sys.stderr, "--> Starting the qrexec daemon..." print >> sys.stderr, "--> Starting the qrexec daemon..."
xid = self.get_xid() xid = self.get_xid()
qrexec_args = [str(xid), self.name, self.default_user]
if not verbose:
qrexec_args.insert(0, "-q")
qrexec_env = os.environ qrexec_env = os.environ
qrexec_env['QREXEC_STARTUP_TIMEOUT'] = str(self.qrexec_timeout) qrexec_env['QREXEC_STARTUP_TIMEOUT'] = str(self.qrexec_timeout)
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"]] +
qrexec_args, env=qrexec_env)
if (retcode != 0) : if (retcode != 0) :
raise OSError ("Cannot execute qrexec-daemon!") raise OSError ("Cannot execute qrexec-daemon!")