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

dom0/core: move qrexec start to separate function

Browse Source
This commit is contained in:
Marek Marczykowski 2012-02-24 04:18:45 +01:00
parent 104030b15c
commit db4a96dfea
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dom0/qvm-core/qubes.py
View File

@ -1153,6 +1153,14 @@ class QubesVm(object):
if notify_function is not None: if notify_function is not None:
notify_function("error", "ERROR: Cannot start the Qubes Clipboard Notifier!") notify_function("error", "ERROR: Cannot start the Qubes Clipboard Notifier!")
def start_qrexec_daemon(self, verbose = False):
if verbose:
print >> sys.stderr, "--> Starting the qrexec daemon..."
retcode = subprocess.call ([qrexec_daemon_path, str(xid)])
if (retcode != 0) :
self.force_shutdown()
raise OSError ("ERROR: Cannot execute qrexec_daemon!")
def start(self, debug_console = False, verbose = False, preparing_dvm = False): def start(self, debug_console = False, verbose = False, preparing_dvm = False):
if dry_run: if dry_run:
return return
@ -1224,12 +1232,7 @@ class QubesVm(object):
qmemman_client.close() qmemman_client.close()
if not preparing_dvm: if not preparing_dvm:
if verbose: self.start_qrexec_daemon(verbose=verbose)
print >> sys.stderr, "--> Starting the qrexec daemon..."
retcode = subprocess.call ([qrexec_daemon_path, str(xid)])
if (retcode != 0) :
self.force_shutdown()
raise OSError ("ERROR: Cannot execute qrexec_daemon!")
if not preparing_dvm and os.path.exists('/var/run/shm.id'): if not preparing_dvm and os.path.exists('/var/run/shm.id'):
self.start_guid(verbose=verbose) self.start_guid(verbose=verbose)