From aa958eeff67f883ee344b3fe5ee82c77a9443f9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sat, 25 Oct 2014 01:45:01 +0200 Subject: [PATCH] core: really quiet mode if vm.start() Pass '-q' option to gui-daemon and qrexec-daemon. --- core-modules/000QubesVm.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core-modules/000QubesVm.py b/core-modules/000QubesVm.py index 7e8540cc..1208a950 100644 --- a/core-modules/000QubesVm.py +++ b/core-modules/000QubesVm.py @@ -1651,6 +1651,8 @@ class QubesVm(object): guid_cmd += extra_guid_args if self.debug: guid_cmd += ['-v', '-v'] + elif not verbose: + guid_cmd += ['-q'] retcode = subprocess.call (guid_cmd) if (retcode != 0) : raise QubesException("Cannot start qubes-guid!") @@ -1672,9 +1674,13 @@ class QubesVm(object): if verbose: print >> sys.stderr, "--> Starting the qrexec daemon..." 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['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) : raise OSError ("Cannot execute qrexec-daemon!")