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

dom0/qvm-start: fix --no-guid switch (#528)

Browse Source
This commit is contained in:
Marek Marczykowski 2012-04-17 02:52:26 +02:00
parent 30d9048be0
commit 6d52e38874
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1337,7 +1337,7 @@ class QubesVm(object):
self.force_shutdown() self.force_shutdown()
raise OSError ("ERROR: Cannot execute qrexec_daemon!") 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, start_guid = True):
if dry_run: if dry_run:
return return
@ -1412,7 +1412,7 @@ class QubesVm(object):
if not preparing_dvm: if not preparing_dvm:
self.start_qrexec_daemon(verbose=verbose) self.start_qrexec_daemon(verbose=verbose)
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:

2
dom0/qvm-tools/qvm-start
View File

@ -85,7 +85,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)