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

Merge branch 'master' into hvm

Browse Source
This commit is contained in:
Marek Marczykowski 2012-02-29 03:58:29 +01:00
commit c44032d37a
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1006,7 +1006,10 @@ class QubesVm(object):
for rule in conf["rules"]: for rule in conf["rules"]:
# For backward compatibility # For backward compatibility
if "proto" not in rule: if "proto" not in rule:
if rule["portBegin"] is not None and rule["portBegin"] > 0:
rule["proto"] = "tcp" rule["proto"] = "tcp"
else:
rule["proto"] = "any"
element = xml.etree.ElementTree.Element( element = xml.etree.ElementTree.Element(
"rule", "rule",
address=rule["address"], address=rule["address"],
@ -1065,16 +1068,19 @@ class QubesVm(object):
else: else:
rule["netmask"] = 32 rule["netmask"] = 32
# For backward compatibility default to tcp
if rule["proto"] is None:
rule["proto"] = "tcp"
if rule["port"] is not None: if rule["port"] is not None:
rule["portBegin"] = int(rule["port"]) rule["portBegin"] = int(rule["port"])
else: else:
# backward compatibility # backward compatibility
rule["portBegin"] = 0 rule["portBegin"] = 0
# For backward compatibility
if rule["proto"] is None:
if rule["portBegin"] > 0:
rule["proto"] = "tcp"
else:
rule["proto"] = "any"
if rule["toport"] is not None: if rule["toport"] is not None:
rule["portEnd"] = int(rule["toport"]) rule["portEnd"] = int(rule["toport"])
else: else:

14
dom0/qvm-core/qubesutils.py
View File

@ -323,6 +323,9 @@ def backup_prepare(base_backup_dir, vms_list = None, exclude_list = [], print_ca
files_to_backup = file_to_backup (qubes_store_filename) files_to_backup = file_to_backup (qubes_store_filename)
if exclude_list is None:
exclude_list = []
if vms_list is None: if vms_list is None:
qvm_collection = QubesVmCollection() qvm_collection = QubesVmCollection()
qvm_collection.lock_db_for_reading() qvm_collection.lock_db_for_reading()
@ -613,7 +616,7 @@ def backup_restore_prepare(backup_dir, options = {}, host_collection = None):
vms_to_restore[vm.name]['already-exists'] = True vms_to_restore[vm.name]['already-exists'] = True
vms_to_restore[vm.name]['good-to-go'] = False vms_to_restore[vm.name]['good-to-go'] = False
if vm.template_vm is not None: if vm.template_vm is None:
vms_to_restore[vm.name]['template'] = None vms_to_restore[vm.name]['template'] = None
else: else:
templatevm_name = find_template_name(vm.template_vm.name, options['replace-template']) templatevm_name = find_template_name(vm.template_vm.name, options['replace-template'])
@ -624,13 +627,13 @@ def backup_restore_prepare(backup_dir, options = {}, host_collection = None):
if not ((template_vm_on_host is not None) and template_vm_on_host.is_template()): if not ((template_vm_on_host is not None) and template_vm_on_host.is_template()):
# Maybe the (custom) template is in the backup? # Maybe the (custom) template is in the backup?
template_vm_on_backup = backup_collection.get_vm_by_name (templatevm_name) template_vm_on_backup = backup_collection.get_vm_by_name (templatevm_name)
if template_vm_on_backup is None or template_vm_on_backup.is_template(): if template_vm_on_backup is None or not template_vm_on_backup.is_template():
if options['use-default-template']: if options['use-default-template']:
vms_to_restore[vm.name]['template'] = host_collection.get_default_tempate_vm().name vms_to_restore[vm.name]['orig-template'] = templatevm_name
vms_to_restore[vm.name]['template'] = host_collection.get_default_template_vm().name
else: else:
vms_to_restore[vm.name]['missing-template'] = True vms_to_restore[vm.name]['missing-template'] = True
vms_to_restore[vm.name]['good-to-go'] = False vms_to_restore[vm.name]['good-to-go'] = False
continue
if vm.netvm_vm is None: if vm.netvm_vm is None:
vms_to_restore[vm.name]['netvm'] = None vms_to_restore[vm.name]['netvm'] = None
@ -653,7 +656,6 @@ def backup_restore_prepare(backup_dir, options = {}, host_collection = None):
else: else:
vms_to_restore[vm.name]['missing-netvm'] = True vms_to_restore[vm.name]['missing-netvm'] = True
vms_to_restore[vm.name]['good-to-go'] = False vms_to_restore[vm.name]['good-to-go'] = False
continue
if 'good-to-go' not in vms_to_restore[vm.name].keys(): if 'good-to-go' not in vms_to_restore[vm.name].keys():
vms_to_restore[vm.name]['good-to-go'] = True vms_to_restore[vm.name]['good-to-go'] = True
@ -757,6 +759,8 @@ def backup_restore_print_summary(restore_info, print_callback = print_stdout):
s += " <-- No matching template on the host or in the backup found!" s += " <-- No matching template on the host or in the backup found!"
elif 'missing-netvm' in vm_info: elif 'missing-netvm' in vm_info:
s += " <-- No matching netvm on the host or in the backup found!" s += " <-- No matching netvm on the host or in the backup found!"
elif 'orig-template' in vm_info:
s += " <-- Original template was '%s'" % (vm_info['orig-template'])
print_callback(s) print_callback(s)