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

backups: fix include/exclude of dom0 home in backup

Browse Source 
Place it in the list just like the other VMs. Then handle separately.
This commit is contained in:
Marek Marczykowski-Górecki 2014-01-10 03:19:22 +01:00
parent 268dcfd71d
commit bcf1a19807
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/backup.py
View File

@ -83,8 +83,9 @@ def backup_prepare(vms_list = None, exclude_list = [],
appvms_to_backup = [vm for vm in selected_vms if vm.is_appvm() and not vm.internal] appvms_to_backup = [vm for vm in selected_vms if vm.is_appvm() and not vm.internal]
netvms_to_backup = [vm for vm in selected_vms if vm.is_netvm() and not vm.qid == 0] netvms_to_backup = [vm for vm in selected_vms if vm.is_netvm() and not vm.qid == 0]
template_vms_worth_backingup = [vm for vm in selected_vms if (vm.is_template() and not vm.installed_by_rpm)] template_vms_worth_backingup = [vm for vm in selected_vms if (vm.is_template() and not vm.installed_by_rpm)]
dom0 = [ qvm_collection[0] ]
vms_list = appvms_to_backup + netvms_to_backup + template_vms_worth_backingup vms_list = appvms_to_backup + netvms_to_backup + template_vms_worth_backingup + dom0
vms_for_backup = vms_list vms_for_backup = vms_list
# Apply exclude list # Apply exclude list
@ -122,6 +123,9 @@ def backup_prepare(vms_list = None, exclude_list = [],
if vm.is_template(): if vm.is_template():
# handle templates later # handle templates later
continue continue
if vm.qid == 0:
# handle dom0 later
continue
if hide_vm_names: if hide_vm_names:
subdir = 'vm%d/' % vm.qid subdir = 'vm%d/' % vm.qid
@ -177,6 +181,9 @@ def backup_prepare(vms_list = None, exclude_list = [],
if not vm.is_template(): if not vm.is_template():
# already handled # already handled
continue continue
if vm.qid == 0:
# handle dom0 later
continue
vm_sz = vm.get_disk_utilization() vm_sz = vm.get_disk_utilization()
if hide_vm_names: if hide_vm_names:
template_subdir = 'vm%d/' % vm.qid template_subdir = 'vm%d/' % vm.qid
@ -209,6 +216,9 @@ def backup_prepare(vms_list = None, exclude_list = [],
# Initialize backup flag on all VMs # Initialize backup flag on all VMs
vms_for_backup_qid = [vm.qid for vm in vms_for_backup] vms_for_backup_qid = [vm.qid for vm in vms_for_backup]
for vm in qvm_collection.values(): for vm in qvm_collection.values():
if vm.qid == 0:
# handle dom0 later
continue
vm.backup_content = False vm.backup_content = False
if vm.qid in vms_for_backup_qid: if vm.qid in vms_for_backup_qid:
@ -220,7 +230,7 @@ def backup_prepare(vms_list = None, exclude_list = [],
vm.backup_path = os.path.relpath(vm.dir_path, system_path["qubes_base_dir"]) vm.backup_path = os.path.relpath(vm.dir_path, system_path["qubes_base_dir"])
# Dom0 user home # Dom0 user home
if not 'dom0' in exclude_list: if 0 in vms_for_backup_qid:
local_user = grp.getgrnam('qubes').gr_mem[0] local_user = grp.getgrnam('qubes').gr_mem[0]
home_dir = pwd.getpwnam(local_user).pw_dir home_dir = pwd.getpwnam(local_user).pw_dir
# Home dir should have only user-owned files, so fix it now to prevent # Home dir should have only user-owned files, so fix it now to prevent