dom0/core: more generic way to specify xen config template

This commit is contained in:
Marek Marczykowski 2012-02-24 04:17:45 +01:00
parent 0c811322c5
commit 104030b15c

View File

@ -78,6 +78,8 @@ default_servicevm_vcpus = 1
default_kernelopts = ""
default_kernelopts_pcidevs = "iommu=soft swiotlb=2048"
config_template_pv = '/usr/share/qubes/vm-template.conf'
qubes_whitelisted_appmenus = 'whitelisted-appmenus.list'
dom0_update_check_interval = 6*3600
@ -238,6 +240,8 @@ class QubesVm(object):
self.firewall_conf = self.absolute_path(firewall_conf, default_firewall_conf_file)
self.config_file_template = config_template_pv
self.updateable = updateable
self.label = label if label is not None else QubesVmLabels["red"]
if self.dir_path is not None:
@ -804,7 +808,7 @@ class QubesVm(object):
if source_template is None:
source_template = self.template_vm
f_conf_template = open('/usr/share/qubes/vm-template.conf', 'r')
f_conf_template = open(self.config_file_template, 'r')
conf_template = f_conf_template.read()
f_conf_template.close()