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

dom0: Use appmenu directory template directly from /usr/share/qubes

Browse Source 
This allows to use common apps.templates for both AppVM and TemplateVM menu
items.
This commit is contained in:
Marek Marczykowski 2011-07-10 23:33:21 +02:00
parent 3e2c427953
commit 4bab5e8834
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom0/aux-tools/create_apps_for_appvm.sh
View File

@ -44,7 +44,11 @@ if [ "$SRCDIR" != "none" ]; then
fi fi
/usr/lib/qubes/convert_apptemplate2vm.sh /usr/share/qubes/qubes-appmenu-select.template $APPSDIR $VMNAME $VMDIR /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 fi
echo "--> Adding Apps to the Menu..." echo "--> Adding Apps to the Menu..."

4
dom0/qvm-tools/qvm-sync-appmenus
View File

@ -189,10 +189,6 @@ def main():
if not os.path.exists(vm.appmenus_templates_dir): if not os.path.exists(vm.appmenus_templates_dir):
os.mkdir(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 # Create new/update existing templates
if options.verbose: if options.verbose: