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

Include appmenus template for TemplateVM when clonning template files (#225)

Browse Source
This commit is contained in:
Marek Marczykowski 2011-04-19 16:09:11 +02:00
parent 067165e030
commit 6eb39106bb
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,7 @@ default_netvms_conf_file = "netvm-template.conf"
default_standalonevms_conf_file = "standalone-template.conf" default_standalonevms_conf_file = "standalone-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_appmenus_template_templates_subdir = "apps-template.templates"
default_kernels_subdir = "kernels" default_kernels_subdir = "kernels"
default_firewall_conf_file = "firewall.xml" default_firewall_conf_file = "firewall.xml"
default_memory = 400 default_memory = 400
@ -1031,6 +1032,7 @@ class QubesTemplateVm(QubesVm):
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
self.appmenus_template_templates_dir = self.dir_path + "/" + default_appmenus_template_templates_subdir
self.appvms = QubesVmCollection() self.appvms = QubesVmCollection()
@property @property
@ -1143,6 +1145,11 @@ class QubesTemplateVm(QubesVm):
format(src_template_vm.appmenus_templates_dir, self.appmenus_templates_dir) format(src_template_vm.appmenus_templates_dir, self.appmenus_templates_dir)
shutil.copytree (src_template_vm.appmenus_templates_dir, self.appmenus_templates_dir) shutil.copytree (src_template_vm.appmenus_templates_dir, self.appmenus_templates_dir)
if verbose:
print "--> Copying the template's appmenus (for template) templates dir:\n{0} ==>\n{1}".\
format(src_template_vm.appmenus_template_templates_dir, self.appmenus_template_templates_dir)
shutil.copytree (src_template_vm.appmenus_template_templates_dir, self.appmenus_template_templates_dir)
icon_path = "/usr/share/qubes/icons/template.png" icon_path = "/usr/share/qubes/icons/template.png"
if verbose: if verbose:
print "--> Creating icon symlink: {0} -> {1}".format(self.icon_path, icon_path) print "--> Creating icon symlink: {0} -> {1}".format(self.icon_path, icon_path)
@ -1152,7 +1159,7 @@ class QubesTemplateVm(QubesVm):
self.commit_changes() self.commit_changes()
# Create appmenus # Create appmenus
self.create_appmenus(verbose, source_template = self) self.create_appmenus(verbose, source_template = src_template_vm)
def create_appmenus(self, verbose, source_template = None): def create_appmenus(self, verbose, source_template = None):
if source_template is None: if source_template is None:
@ -1160,7 +1167,7 @@ class QubesTemplateVm(QubesVm):
try: try:
if source_template is not None: if source_template is not None:
subprocess.check_call ([qubes_appmenu_create_cmd, source_template.dir_path + "/apps-template.templates", self.name, "vm-templates"]) subprocess.check_call ([qubes_appmenu_create_cmd, source_template.appmenus_template_templates_dir, self.name, "vm-templates"])
else: else:
# Only add apps to menu # Only add apps to menu
subprocess.check_call ([qubes_appmenu_create_cmd, "none", self.name, vmtype]) subprocess.check_call ([qubes_appmenu_create_cmd, "none", self.name, vmtype])