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

backup: fix restoring on system without default netvm

Browse Source 
Fixes QubesOS/qubes-issues#2168
This commit is contained in:
Marek Marczykowski-Górecki 2016-07-14 02:06:08 +02:00
parent 4072914b40
commit f15ddf7801
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/backup.py
View File

@ -1718,8 +1718,9 @@ def restore_info_verify(restore_info, host_collection):
if not (netvm_name in restore_info.keys() and if not (netvm_name in restore_info.keys() and
restore_info[netvm_name]['vm'].is_netvm()): restore_info[netvm_name]['vm'].is_netvm()):
if options['use-default-netvm']: if options['use-default-netvm']:
vm_info['netvm'] = host_collection \ default_netvm = host_collection.get_default_netvm()
.get_default_netvm().name vm_info['netvm'] = default_netvm.name if \
default_netvm else None
vm_info['vm'].uses_default_netvm = True vm_info['vm'].uses_default_netvm = True
elif options['use-none-netvm']: elif options['use-none-netvm']:
vm_info['netvm'] = None vm_info['netvm'] = None