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

core: verify template compatibility when adding new VM

Browse Source 
It is done in Qubes Manager, but do it at lower level - especially for
qvm-create tool.
This commit is contained in:
Marek Marczykowski-Górecki 2014-04-18 01:35:12 +02:00
parent 113fe3391d
commit f324f4eef8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/qubes.py
View File

@ -249,7 +249,13 @@ class QubesVmCollection(dict):
raise ValueError("Unknown VM type: %s" % vm_type) raise ValueError("Unknown VM type: %s" % vm_type)
qid = self.get_new_unused_qid() qid = self.get_new_unused_qid()
vm = QubesVmClasses[vm_type](qid=qid, collection=self, **kwargs) vm_cls = QubesVmClasses[vm_type]
if 'template' in kwargs:
if not vm_cls.is_template_compatible(kwargs['template']):
raise QubesException("Template not compatible with selected "
"VM type")
vm = vm_cls(qid=qid, collection=self, **kwargs)
if not self.verify_new_vm(vm): if not self.verify_new_vm(vm):
raise QubesException("Wrong VM description!") raise QubesException("Wrong VM description!")
self[vm.qid] = vm self[vm.qid] = vm