From 4bab5e8834fe1e2c7fc2a420599e5863fb386398 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sun, 10 Jul 2011 23:33:21 +0200 Subject: [PATCH] dom0: Use appmenu directory template directly from /usr/share/qubes This allows to use common apps.templates for both AppVM and TemplateVM menu items. --- dom0/aux-tools/create_apps_for_appvm.sh | 6 +++++- dom0/qvm-tools/qvm-sync-appmenus | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dom0/aux-tools/create_apps_for_appvm.sh b/dom0/aux-tools/create_apps_for_appvm.sh index c727d534..eb5410ba 100755 --- a/dom0/aux-tools/create_apps_for_appvm.sh +++ b/dom0/aux-tools/create_apps_for_appvm.sh @@ -44,7 +44,11 @@ if [ "$SRCDIR" != "none" ]; then fi /usr/lib/qubes/convert_apptemplate2vm.sh /usr/share/qubes/qubes-appmenu-select.template $APPSDIR $VMNAME $VMDIR - /usr/lib/qubes/convert_dirtemplate2vm.sh $SRCDIR/qubes-*.directory.template $APPSDIR/$VMNAME-vm.directory $VMNAME $VMDIR + if [ "$VMTYPE" = "vm-templates" ]; then + /usr/lib/qubes/convert_dirtemplate2vm.sh /usr/share/qubes/qubes-templatevm.directory.template $APPSDIR/$VMNAME-vm.directory $VMNAME $VMDIR + else + /usr/lib/qubes/convert_dirtemplate2vm.sh /usr/share/qubes/qubes-vm.directory.template $APPSDIR/$VMNAME-vm.directory $VMNAME $VMDIR + fi fi echo "--> Adding Apps to the Menu..." diff --git a/dom0/qvm-tools/qvm-sync-appmenus b/dom0/qvm-tools/qvm-sync-appmenus index f292c2f1..dd07cce4 100755 --- a/dom0/qvm-tools/qvm-sync-appmenus +++ b/dom0/qvm-tools/qvm-sync-appmenus @@ -189,10 +189,6 @@ def main(): if not os.path.exists(vm.appmenus_templates_dir): os.mkdir(vm.appmenus_templates_dir) - if vm.is_template(): - shutil.copy('/usr/share/qubes/qubes-templatevm.directory.template', vm.appmenus_templates_dir) - else: - shutil.copy('/usr/share/qubes/qubes-vm.directory.template', vm.appmenus_templates_dir) # Create new/update existing templates if options.verbose: