From 478b57f3a99878a37ae0002e6da3ba352ad507b3 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Tue, 1 May 2012 02:04:16 +0200 Subject: [PATCH] dom0: create appmenus template and icon for all VMs --- dom0/qvm-core/qubes.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py index 03dcaa49..3fb1e6fe 100755 --- a/dom0/qvm-core/qubes.py +++ b/dom0/qvm-core/qubes.py @@ -988,9 +988,18 @@ class QubesVm(object): for f in ("vmlinuz", "initramfs", "modules.img"): shutil.copy(kernels_dir + '/' + f, self.dir_path + '/kernels/' + f) + if verbose: + print >> sys.stderr, "--> Copying the template's appmenus templates dir:\n{0} ==>\n{1}".\ + format(source_template.appmenus_templates_dir, self.appmenus_templates_dir) + shutil.copytree (source_template.appmenus_templates_dir, self.appmenus_templates_dir) + # Create volatile.img self.reset_volatile_storage(source_template = source_template, verbose=verbose) + if verbose: + print >> sys.stderr, "--> Creating icon symlink: {0} -> {1}".format(self.icon_path, self.label.icon_path) + os.symlink (self.label.icon_path, self.icon_path) + def create_appmenus(self, verbose, source_template = None): if source_template is None: source_template = self.template @@ -2129,16 +2138,6 @@ class QubesAppVm(QubesVm): super(QubesAppVm, self).create_on_disk(verbose, source_template=source_template) - if self.updateable: - if verbose: - print >> sys.stderr, "--> Copying the template's appmenus templates dir:\n{0} ==>\n{1}".\ - format(source_template.appmenus_templates_dir, self.appmenus_templates_dir) - shutil.copytree (source_template.appmenus_templates_dir, self.appmenus_templates_dir) - - if verbose: - print >> sys.stderr, "--> Creating icon symlink: {0} -> {1}".format(self.icon_path, self.label.icon_path) - os.symlink (self.label.icon_path, self.icon_path) - if not self.internal: self.create_appmenus (verbose, source_template=source_template)