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

Create NetVM xen config from separate template (netvm-template.conf)

Browse Source
This commit is contained in:
Marek Marczykowski 2011-03-15 20:27:37 +01:00
parent 14c48f5253
commit 7dbe6e1731
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,6 +63,7 @@ default_rootcow_img = "root-cow.img"
default_swapcow_img = "swap-cow.img" default_swapcow_img = "swap-cow.img"
default_private_img = "private.img" default_private_img = "private.img"
default_appvms_conf_file = "appvm-template.conf" default_appvms_conf_file = "appvm-template.conf"
default_netvms_conf_file = "netvm-template.conf"
default_templatevm_conf_template = "templatevm.conf" # needed for TemplateVM cloning default_templatevm_conf_template = "templatevm.conf" # needed for TemplateVM cloning
default_appmenus_templates_subdir = "apps.templates" default_appmenus_templates_subdir = "apps.templates"
default_kernels_subdir = "kernels" default_kernels_subdir = "kernels"
@ -637,6 +638,12 @@ class QubesTemplateVm(QubesVm):
self.appvms_conf_file = dir_path + "/" + ( self.appvms_conf_file = dir_path + "/" + (
appvms_conf_file if appvms_conf_file is not None else default_appvms_conf_file) appvms_conf_file if appvms_conf_file is not None else default_appvms_conf_file)
if netvms_conf_file is not None and os.path.isabs(netvms_conf_file):
self.netvms_conf_file = netvms_conf_file
else:
self.netvms_conf_file = dir_path + "/" + (
netvms_conf_file if netvms_conf_file is not None else default_netvms_conf_file)
self.templatevm_conf_template = self.dir_path + "/" + default_templatevm_conf_template self.templatevm_conf_template = self.dir_path + "/" + default_templatevm_conf_template
self.kernels_dir = self.dir_path + "/" + default_kernels_subdir self.kernels_dir = self.dir_path + "/" + default_kernels_subdir
self.appmenus_templates_dir = self.dir_path + "/" + default_appmenus_templates_subdir self.appmenus_templates_dir = self.dir_path + "/" + default_appmenus_templates_subdir
@ -695,6 +702,11 @@ class QubesTemplateVm(QubesVm):
format(src_template_vm.appvms_conf_file, self.appvms_conf_file) format(src_template_vm.appvms_conf_file, self.appvms_conf_file)
shutil.copy (src_template_vm.appvms_conf_file, self.appvms_conf_file) shutil.copy (src_template_vm.appvms_conf_file, self.appvms_conf_file)
if verbose:
print "--> Copying the VM config template :\n{0} ==>\n{1}".\
format(src_template_vm.netvms_conf_file, self.netvms_conf_file)
shutil.copy (src_template_vm.netvms_conf_file, self.netvms_conf_file)
if verbose: if verbose:
print "--> Copying the template's private image:\n{0} ==>\n{1}".\ print "--> Copying the template's private image:\n{0} ==>\n{1}".\
format(src_template_vm.private_img, self.private_img) format(src_template_vm.private_img, self.private_img)
@ -816,6 +828,7 @@ class QubesTemplateVm(QubesVm):
dir_path=self.dir_path, dir_path=self.dir_path,
conf_file=self.conf_file, conf_file=self.conf_file,
appvms_conf_file=self.appvms_conf_file, appvms_conf_file=self.appvms_conf_file,
netvms_conf_file=self.netvms_conf_file,
root_img=self.root_img, root_img=self.root_img,
rootcow_img=self.rootcow_img, rootcow_img=self.rootcow_img,
private_img=self.private_img, private_img=self.private_img,
@ -880,7 +893,11 @@ class QubesCowVm(QubesVm):
raise QubesException ("TemaplteVM is updateable: cannot make the template based VM '{0}' updateable".format(self.name)) raise QubesException ("TemaplteVM is updateable: cannot make the template based VM '{0}' updateable".format(self.name))
def create_config_file(self): def create_config_file(self):
conf_template = open (self.template_vm.appvms_conf_file, "r") conf_template = None
if self.type == "NetVM":
conf_template = open (self.template_vm.netvms_conf_file, "r")
else:
conf_template = open (self.template_vm.appvms_conf_file, "r")
if os.path.isfile(self.conf_file): if os.path.isfile(self.conf_file):
shutil.copy(self.conf_file, self.conf_file + ".backup") shutil.copy(self.conf_file, self.conf_file + ".backup")
conf_appvm = open(self.conf_file, "w") conf_appvm = open(self.conf_file, "w")
@ -1814,7 +1831,8 @@ class QubesVmCollection(dict):
kwargs = {} kwargs = {}
attr_list = ("qid", "name", "dir_path", "conf_file", attr_list = ("qid", "name", "dir_path", "conf_file",
"appvms_conf_file", "private_img", "root_img", "appvms_conf_file", "appvms_conf_file",
"private_img", "root_img",
"installed_by_rpm", "updateable", "installed_by_rpm", "updateable",
"uses_default_netvm") "uses_default_netvm")