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

backup: add option to use default kernel for restored VMs

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2016-06-15 19:10:52 +02:00
parent 91404cc647
commit 98effef606
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
qubes/backup.py
View File

@ -1237,6 +1237,9 @@ class BackupRestoreOptions(object):
#: set template to default if the one referenced in backup do not #: set template to default if the one referenced in backup do not
# exists on the host # exists on the host
self.use_default_template = True self.use_default_template = True
#: use default kernel if the one referenced in backup do not exists
# on the host
self.use_default_kernel = True
#: restore dom0 home #: restore dom0 home
self.dom0_home = True self.dom0_home = True
#: dictionary how what templates should be used instead of those #: dictionary how what templates should be used instead of those
@ -1271,6 +1274,8 @@ class BackupRestore(object):
MISSING_NETVM = object() MISSING_NETVM = object()
#: TemplateVM used by the VM does not exists on the host #: TemplateVM used by the VM does not exists on the host
MISSING_TEMPLATE = object() MISSING_TEMPLATE = object()
#: Kernel used by the VM does not exists on the host
MISSING_KERNEL = object()
def __init__(self, vm): def __init__(self, vm):
self.vm = vm self.vm = vm
@ -1824,6 +1829,19 @@ class BackupRestore(object):
else: else:
vm_info.problems.add(self.VMToRestore.MISSING_NETVM) vm_info.problems.add(self.VMToRestore.MISSING_NETVM)
# check kernel
if hasattr(vm_info.vm, 'kernel'):
installed_kernels = os.listdir(os.path.join(
qubes.config.qubes_base_dir,
qubes.config.system_path['qubes_kernels_base_dir']))
if not vm_info.vm.property_is_default('kernel') \
and vm_info.vm.kernel \
and vm_info.vm.kernel not in installed_kernels:
if self.options.use_default_kernel:
vm_info.vm.kernel = qubes.property.DEFAULT
else:
vm_info.problems.add(self.VMToRestore.MISSING_KERNEL)
return restore_info return restore_info
def _is_vm_included_in_backup_v1(self, check_vm): def _is_vm_included_in_backup_v1(self, check_vm):
@ -2158,16 +2176,6 @@ class BackupRestore(object):
del self.app.domains[new_vm.qid] del self.app.domains[new_vm.qid]
continue continue
if hasattr(vm, 'kernel'):
# TODO: add a setting for this?
if not vm.property_is_default('kernel') and vm.kernel and \
vm.kernel not in \
os.listdir(os.path.join(qubes.config.qubes_base_dir,
qubes.config.system_path[
'qubes_kernels_base_dir'])):
self.log.warning("Kernel %s not installed, "
"using default one" % vm.kernel)
vm.kernel = qubes.property.DEFAULT
# remove no longer needed backup metadata # remove no longer needed backup metadata
if 'backup-content' in vm.features: if 'backup-content' in vm.features:
del vm.features['backup-content'] del vm.features['backup-content']