diff --git a/conf/liveusb.ks b/conf/liveusb.ks index 02a2400..4f3e989 100644 --- a/conf/liveusb.ks +++ b/conf/liveusb.ks @@ -85,8 +85,20 @@ echo 'File created by kickstart. See systemd-update-done.service(8).' \ qubes-prefs -s default-template fedora-21 # TODO: icons? -cat /usr/share/qubes/live-default-appmenus | /usr/bin/qvm-sync-appmenus \ - --force-root --offline-mode `qubes-prefs default-template` +for tpl in `ls /var/lib/qubes/vm-templates`; do + case $tpl in + fedora*) + cat /usr/share/qubes/live-default-appmenus-fedora | \ + /usr/bin/qvm-sync-appmenus \ + --force-root --offline-mode $tpl + ;; + debian*) + cat /usr/share/qubes/live-default-appmenus-debian | \ + /usr/bin/qvm-sync-appmenus \ + --force-root --offline-mode $tpl + ;; + esac +done # we won't do `useradd qubes`, since his creation depends of persistent home # feature; see /etc/rc.d/init.d/livesys diff --git a/live/default-appmenus-debian b/live/default-appmenus-debian new file mode 100644 index 0000000..2e06fb4 --- /dev/null +++ b/live/default-appmenus-debian @@ -0,0 +1,131 @@ +/usr/share/applications/yelp.desktop:Name=Help +/usr/share/applications/yelp.desktop:Comment=Get help with GNOME +/usr/share/applications/yelp.desktop:Exec=qubes-desktop-run /usr/share/applications/yelp.desktop +/usr/share/applications/yelp.desktop:Categories=GNOME;GTK;Core;Documentation;Utility; +/usr/share/applications/gcr-prompter.desktop:Name=Access Prompt +/usr/share/applications/gcr-prompter.desktop:Comment=Unlock access to passwords and other secrets +/usr/share/applications/gcr-prompter.desktop:Exec=qubes-desktop-run /usr/share/applications/gcr-prompter.desktop +/usr/share/applications/nm-applet.desktop:Name=Network +/usr/share/applications/nm-applet.desktop:Comment=Manage your network connections +/usr/share/applications/nm-applet.desktop:Exec=qubes-desktop-run /usr/share/applications/nm-applet.desktop +/usr/share/applications/vim.desktop:Name=Vim +/usr/share/applications/vim.desktop:GenericName=Text Editor +/usr/share/applications/vim.desktop:Comment=Edit text files +/usr/share/applications/vim.desktop:Exec=qubes-desktop-run /usr/share/applications/vim.desktop +/usr/share/applications/vim.desktop:Categories=Utility;TextEditor; +/usr/share/applications/mutt.desktop:Categories=Office;Network;Email; +/usr/share/applications/mutt.desktop:Comment=Simple text-based Mail User Agent +/usr/share/applications/mutt.desktop:Exec=qubes-desktop-run /usr/share/applications/mutt.desktop +/usr/share/applications/mutt.desktop:Name=mutt +/usr/share/applications/gpk-application.desktop:Name=Packages +/usr/share/applications/gpk-application.desktop:Comment=Add or remove software installed on the system +/usr/share/applications/gpk-application.desktop:Exec=qubes-desktop-run /usr/share/applications/gpk-application.desktop +/usr/share/applications/gpk-application.desktop:Categories=GNOME;GTK;System;Settings;PackageManager; +/usr/share/applications/mate-notification-properties.desktop:Name=Pop-Up Notifications +/usr/share/applications/mate-notification-properties.desktop:Comment=Set your pop-up notification preferences +/usr/share/applications/mate-notification-properties.desktop:Exec=qubes-desktop-run /usr/share/applications/mate-notification-properties.desktop +/usr/share/applications/mate-notification-properties.desktop:Categories=GTK;Settings;DesktopSettings; +/usr/share/applications/debian-uxterm.desktop:Name=UXTerm +/usr/share/applications/debian-uxterm.desktop:Comment=standard terminal emulator for the X window system +/usr/share/applications/debian-uxterm.desktop:Exec=qubes-desktop-run /usr/share/applications/debian-uxterm.desktop +/usr/share/applications/debian-uxterm.desktop:Categories=System;TerminalEmulator;Utility; +/usr/share/applications/iceweasel.desktop:Name=Iceweasel +/usr/share/applications/iceweasel.desktop:Comment=Browse the World Wide Web +/usr/share/applications/iceweasel.desktop:GenericName=Web Browser +/usr/share/applications/iceweasel.desktop:Exec=qubes-desktop-run /usr/share/applications/iceweasel.desktop +/usr/share/applications/iceweasel.desktop:Categories=Network;WebBrowser; +/usr/share/applications/display-im6.q16.desktop:Name=ImageMagick (display Q16) +/usr/share/applications/display-im6.q16.desktop:Comment=Display and edit image files +/usr/share/applications/display-im6.q16.desktop:Exec=qubes-desktop-run /usr/share/applications/display-im6.q16.desktop +/usr/share/applications/display-im6.q16.desktop:Categories=Graphics; +/usr/share/applications/org.gnome.Nautilus.desktop:Name=Files +/usr/share/applications/org.gnome.Nautilus.desktop:Comment=Access and organize files +/usr/share/applications/org.gnome.Nautilus.desktop:Exec=qubes-desktop-run /usr/share/applications/org.gnome.Nautilus.desktop +/usr/share/applications/org.gnome.Nautilus.desktop:Categories=GNOME;GTK;Utility;Core;FileManager; +/usr/share/applications/python3.4.desktop:Name=Python (v3.4) +/usr/share/applications/python3.4.desktop:Comment=Python Interpreter (v3.4) +/usr/share/applications/python3.4.desktop:Exec=qubes-desktop-run /usr/share/applications/python3.4.desktop +/usr/share/applications/python3.4.desktop:Categories=Development; +/usr/share/applications/gpk-prefs.desktop:Name=Package Sources +/usr/share/applications/gpk-prefs.desktop:Comment=Enable or disable package repositories +/usr/share/applications/gpk-prefs.desktop:Exec=qubes-desktop-run /usr/share/applications/gpk-prefs.desktop +/usr/share/applications/gpk-prefs.desktop:Categories=Settings;X-GNOME-SystemSettings; +/usr/share/applications/gpk-update-viewer.desktop:Name=Package Updater +/usr/share/applications/gpk-update-viewer.desktop:Comment=Update software installed on the system +/usr/share/applications/gpk-update-viewer.desktop:Exec=qubes-desktop-run /usr/share/applications/gpk-update-viewer.desktop +/usr/share/applications/gpk-update-viewer.desktop:Categories=GNOME;GTK;System; +/usr/share/applications/display-im6.desktop:Name=ImageMagick (display Q16) +/usr/share/applications/display-im6.desktop:Comment=Display and edit image files +/usr/share/applications/display-im6.desktop:Exec=qubes-desktop-run /usr/share/applications/display-im6.desktop +/usr/share/applications/display-im6.desktop:Categories=Graphics; +/usr/share/applications/system-config-printer.desktop:Name=Print Settings +/usr/share/applications/system-config-printer.desktop:Comment=Configure printers +/usr/share/applications/system-config-printer.desktop:Exec=qubes-desktop-run /usr/share/applications/system-config-printer.desktop +/usr/share/applications/system-config-printer.desktop:Categories=System;Settings;HardwareSettings;Printing;GTK; +/usr/share/applications/emacs24.desktop:Name=GNU Emacs 24 +/usr/share/applications/emacs24.desktop:GenericName=Text Editor +/usr/share/applications/emacs24.desktop:Comment=View and edit files +/usr/share/applications/emacs24.desktop:Exec=qubes-desktop-run /usr/share/applications/emacs24.desktop +/usr/share/applications/emacs24.desktop:Categories=Utility;Development;TextEditor; +/usr/share/applications/gpk-log.desktop:Name=Package Log +/usr/share/applications/gpk-log.desktop:Comment=View past package management tasks +/usr/share/applications/gpk-log.desktop:Exec=qubes-desktop-run /usr/share/applications/gpk-log.desktop +/usr/share/applications/gpk-log.desktop:Categories=GNOME;GTK;System; +/usr/share/applications/nm-connection-editor.desktop:Name=Network Connections +/usr/share/applications/nm-connection-editor.desktop:Comment=Manage and change your network connection settings +/usr/share/applications/nm-connection-editor.desktop:Exec=qubes-desktop-run /usr/share/applications/nm-connection-editor.desktop +/usr/share/applications/nm-connection-editor.desktop:Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings; +/usr/share/applications/keepassx.desktop:Name=KeePassX +/usr/share/applications/keepassx.desktop:GenericName=Cross Platform Password Manager +/usr/share/applications/keepassx.desktop:Exec=qubes-desktop-run /usr/share/applications/keepassx.desktop +/usr/share/applications/keepassx.desktop:Comment=Cross Platform Password Manager +/usr/share/applications/keepassx.desktop:Categories=Qt;Utility;Security; +/usr/share/applications/qtconfig-qt4.desktop:Categories=Qt;Settings; +/usr/share/applications/qtconfig-qt4.desktop:Exec=qubes-desktop-run /usr/share/applications/qtconfig-qt4.desktop +/usr/share/applications/qtconfig-qt4.desktop:Name=Qt 4 Settings +/usr/share/applications/nautilus-classic.desktop:Name=Desktop Icons +/usr/share/applications/nautilus-classic.desktop:Comment=Classic session desktop file for desktop icons +/usr/share/applications/nautilus-classic.desktop:Exec=qubes-desktop-run /usr/share/applications/nautilus-classic.desktop +/usr/share/applications/icedove.desktop:Name=Icedove +/usr/share/applications/icedove.desktop:Comment=Read/Write Mail/News with Icedove +/usr/share/applications/icedove.desktop:GenericName=Mail Client +/usr/share/applications/icedove.desktop:Exec=qubes-desktop-run /usr/share/applications/icedove.desktop +/usr/share/applications/icedove.desktop:Categories=Network;Email;News;GTK; +/usr/share/applications/gnome-terminal.desktop:Name=Terminal +/usr/share/applications/gnome-terminal.desktop:Comment=Use the command line +/usr/share/applications/gnome-terminal.desktop:Exec=qubes-desktop-run /usr/share/applications/gnome-terminal.desktop +/usr/share/applications/gnome-terminal.desktop:Categories=GNOME;GTK;System;TerminalEmulator; +/usr/share/applications/reportbug.desktop:Name=Reportbug +/usr/share/applications/reportbug.desktop:Comment=Report bugs to the Debian BTS +/usr/share/applications/reportbug.desktop:GenericName=Debian bug reporting tool +/usr/share/applications/reportbug.desktop:Exec=qubes-desktop-run /usr/share/applications/reportbug.desktop +/usr/share/applications/reportbug.desktop:Categories=System; +/usr/share/applications/geoclue-where-am-i.desktop:Name=Where am I? +/usr/share/applications/geoclue-where-am-i.desktop:GenericName=Demo geolocation application +/usr/share/applications/geoclue-where-am-i.desktop:Comment=Find your current location +/usr/share/applications/geoclue-where-am-i.desktop:Exec=qubes-desktop-run /usr/share/applications/geoclue-where-am-i.desktop +/usr/share/applications/python2.7.desktop:Name=Python (v2.7) +/usr/share/applications/python2.7.desktop:Comment=Python Interpreter (v2.7) +/usr/share/applications/python2.7.desktop:Exec=qubes-desktop-run /usr/share/applications/python2.7.desktop +/usr/share/applications/python2.7.desktop:Categories=Development; +/usr/share/applications/gcr-viewer.desktop:Name=View file +/usr/share/applications/gcr-viewer.desktop:Exec=qubes-desktop-run /usr/share/applications/gcr-viewer.desktop +/usr/share/applications/nautilus-connect-server.desktop:Name=Connect to Server +/usr/share/applications/nautilus-connect-server.desktop:Exec=qubes-desktop-run /usr/share/applications/nautilus-connect-server.desktop +/usr/share/applications/nautilus-autorun-software.desktop:Name=Run Software +/usr/share/applications/nautilus-autorun-software.desktop:Exec=qubes-desktop-run /usr/share/applications/nautilus-autorun-software.desktop +/usr/share/applications/notification-daemon.desktop:Name=Notification Daemon +/usr/share/applications/notification-daemon.desktop:Comment=Display notifications +/usr/share/applications/notification-daemon.desktop:Exec=qubes-desktop-run /usr/share/applications/notification-daemon.desktop +/usr/share/applications/debian-xterm.desktop:Name=XTerm +/usr/share/applications/debian-xterm.desktop:Comment=standard terminal emulator for the X window system +/usr/share/applications/debian-xterm.desktop:Exec=qubes-desktop-run /usr/share/applications/debian-xterm.desktop +/usr/share/applications/debian-xterm.desktop:Categories=System;TerminalEmulator;Utility; +/usr/share/applications/gpk-install-local-file.desktop:Name=Package Install +/usr/share/applications/gpk-install-local-file.desktop:Comment=Install selected packages on the system +/usr/share/applications/gpk-install-local-file.desktop:Categories=System; +/usr/share/applications/gpk-install-local-file.desktop:Exec=qubes-desktop-run /usr/share/applications/gpk-install-local-file.desktop +/usr/share/applications/gpk-dbus-service.desktop:Name=Software Install +/usr/share/applications/gpk-dbus-service.desktop:Comment=Install selected software on the system +/usr/share/applications/gpk-dbus-service.desktop:Categories=System; +/usr/share/applications/gpk-dbus-service.desktop:Exec=qubes-desktop-run /usr/share/applications/gpk-dbus-service.desktop diff --git a/live/default-appmenus b/live/default-appmenus-fedora similarity index 100% rename from live/default-appmenus rename to live/default-appmenus-fedora diff --git a/live/qubes-live.spec b/live/qubes-live.spec index 9fbc853..b784831 100644 --- a/live/qubes-live.spec +++ b/live/qubes-live.spec @@ -34,7 +34,10 @@ install -D -m 0644 lightdm-qubes-live.conf \ $RPM_BUILD_ROOT/etc/lightdm/lightdm.conf.d/50-qubes-live.conf -install -D -m 0644 default-appmenus $RPM_BUILD_ROOT/usr/share/qubes/live-default-appmenus +install -D -m 0644 default-appmenus-fedora \ + $RPM_BUILD_ROOT/usr/share/qubes/live-default-appmenus-fedora +install -D -m 0644 default-appmenus-debian \ + $RPM_BUILD_ROOT/usr/share/qubes/live-default-appmenus-debian %post @@ -74,7 +77,8 @@ fi /etc/rc.d/init.d/livesys /etc/rc.d/init.d/livesys-late /etc/lightdm/lightdm.conf.d/50-qubes-live.conf -/usr/share/qubes/live-default-appmenus +/usr/share/qubes/live-default-appmenus-fedora +/usr/share/qubes/live-default-appmenus-debian %changelog