dom0/qvm-start: fix --no-guid switch (#528)
This commit is contained in:
parent
73b6149a27
commit
ceeed3bd8b
@ -1322,7 +1322,7 @@ 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(self, debug_console = False, verbose = False, preparing_dvm = False):
|
def start(self, debug_console = False, verbose = False, preparing_dvm = False, start_guid = True):
|
||||||
if dry_run:
|
if dry_run:
|
||||||
return
|
return
|
||||||
|
|
||||||
@ -1405,7 +1405,7 @@ class QubesVm(object):
|
|||||||
self.force_shutdown()
|
self.force_shutdown()
|
||||||
raise OSError ("ERROR: Cannot execute qrexec_daemon!")
|
raise OSError ("ERROR: Cannot execute qrexec_daemon!")
|
||||||
|
|
||||||
if not preparing_dvm and os.path.exists('/var/run/shm.id'):
|
if start_guid and not preparing_dvm and os.path.exists('/var/run/shm.id'):
|
||||||
self.start_guid(verbose=verbose)
|
self.start_guid(verbose=verbose)
|
||||||
|
|
||||||
if preparing_dvm:
|
if preparing_dvm:
|
||||||
|
@ -62,7 +62,7 @@ def main():
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
vm.verify_files()
|
vm.verify_files()
|
||||||
xid = vm.start(debug_console=options.debug_console, verbose=options.verbose, preparing_dvm=options.preparing_dvm)
|
xid = vm.start(debug_console=options.debug_console, verbose=options.verbose, preparing_dvm=options.preparing_dvm, start_guid=not options.noguid)
|
||||||
except (IOError, OSError, QubesException) as err:
|
except (IOError, OSError, QubesException) as err:
|
||||||
print >> sys.stderr, "ERROR: {0}".format(err)
|
print >> sys.stderr, "ERROR: {0}".format(err)
|
||||||
exit (1)
|
exit (1)
|
||||||
|
Loading…
Reference in New Issue
Block a user