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

Fix qvm-start

Browse Source
This commit is contained in:
Bahtiar `kalkin-` Gadimov 2016-06-21 17:03:04 +02:00
parent 66f46d8a25
commit 87ae5a3b65
No known key found for this signature in database
GPG Key ID: 96ED3C3BA19C3DEE
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qubes/tools/qvm_start.py
View File

@ -128,17 +128,9 @@ def main(args=None):
vm.debug = args.debug vm.debug = args.debug
try: try:
vm.verify_files()
except (IOError, OSError) as e:
parser.error(
'error verifying files for domain {!r}: {!r}'.format(vm.name, e))
try:
#xid =
vm.start( vm.start(
preparing_dvm=args.preparing_dvm, preparing_dvm=args.preparing_dvm,
start_guid=args.start_guid) start_guid=args.start_guid)
# notify_function=
except qubes.exc.QubesException as e: except qubes.exc.QubesException as e:
parser.error_runtime('Qubes error: {!r}'.format(e)) parser.error_runtime('Qubes error: {!r}'.format(e))

2
qubes/vm/mix/net.py
View File

@ -325,7 +325,7 @@ class NetVMMixin(qubes.events.Emitter):
pass pass
@qubes.events.handler('firewall-changed', 'domain-spawn') @qubes.events.handler('firewall-changed', 'domain-spawn')
def on_firewall_changed(self, event): def on_firewall_changed(self, event, **kwargs):
''' Reloads the firewall if vm is running and has a NetVM assigned ''' ''' Reloads the firewall if vm is running and has a NetVM assigned '''
# pylint: disable=unused-argument # pylint: disable=unused-argument
if self.is_running() and self.netvm: if self.is_running() and self.netvm: