From fe209dfd24a6ed0b1fae99c3192c1a46b1ba1fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 8 Aug 2016 14:38:50 +0200 Subject: [PATCH] appmenus: clone default whitelists for VM type Don't bother with checking whether it is a template or not - when cloning VM disk files, copy those files anyway (if exist of course). --- qubesappmenus/__init__.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/qubesappmenus/__init__.py b/qubesappmenus/__init__.py index 856f2b2..fa85e1e 100644 --- a/qubesappmenus/__init__.py +++ b/qubesappmenus/__init__.py @@ -443,9 +443,8 @@ class AppmenusExtension(qubes.ext.Extension): yield self.template_icons_dir(vm) if os.path.exists(self.whitelist_path(vm)): yield self.whitelist_path(vm) - if vm.is_template(): - for whitelist in ( - 'vm-' + AppmenusSubdirs.whitelist, - 'netvm-' + AppmenusSubdirs.whitelist): - if os.path.exists(os.path.join(vm.dir_path, whitelist)): - yield os.path.join(vm.dir_path, whitelist) + for whitelist in ( + 'vm-' + AppmenusSubdirs.whitelist, + 'netvm-' + AppmenusSubdirs.whitelist): + if os.path.exists(os.path.join(vm.dir_path, whitelist)): + yield os.path.join(vm.dir_path, whitelist)