From db32b65d8146ef88175b0dc838c3d16a9a51ffeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 17 Jul 2016 00:00:47 +0200 Subject: [PATCH] appmenus: add xterm in Disposable VM menu entry Fixes QubesOS/qubes-issues#1612 --- appmenus-files/qubes-dispvm-xterm.desktop | 10 ++++++++++ rpm_spec/core-dom0-linux.spec | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 appmenus-files/qubes-dispvm-xterm.desktop diff --git a/appmenus-files/qubes-dispvm-xterm.desktop b/appmenus-files/qubes-dispvm-xterm.desktop new file mode 100644 index 0000000..4d2abbd --- /dev/null +++ b/appmenus-files/qubes-dispvm-xterm.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Exec=sh -c 'echo xterm | /usr/lib/qubes/qfile-daemon-dvm qubes.VMShell dom0 DEFAULT red' +Icon=dispvm-red +Terminal=false +Name=DispVM: xterm +GenericName=DispVM: Terminal +StartupNotify=false +Categories=Network;X-Qubes-VM; diff --git a/rpm_spec/core-dom0-linux.spec b/rpm_spec/core-dom0-linux.spec index b6e515b..f043a4b 100644 --- a/rpm_spec/core-dom0-linux.spec +++ b/rpm_spec/core-dom0-linux.spec @@ -186,7 +186,7 @@ for i in /usr/share/qubes/icons/*.png ; do done xdg-icon-resource forceupdate -xdg-desktop-menu install /usr/share/qubes-appmenus/qubes-dispvm.directory /usr/share/qubes-appmenus/qubes-dispvm-firefox.desktop +xdg-desktop-menu install /usr/share/qubes-appmenus/qubes-dispvm.directory /usr/share/qubes-appmenus/qubes-dispvm-*.desktop /usr/lib/qubes/patch-dnf-yum-config @@ -200,7 +200,7 @@ if [ "$1" = 0 ] ; then xdg-icon-resource uninstall --novendor --size 48 $i done - xdg-desktop-menu uninstall /usr/share/qubes-appmenus/qubes-dispvm.directory /usr/share/qubes-appmenus/qubes-dispvm-firefox.desktop + xdg-desktop-menu uninstall /usr/share/qubes-appmenus/qubes-dispvm.directory /usr/share/qubes-appmenus/qubes-dispvm-*.desktop systemctl disable qubes-suspend.service > /dev/null 2>&1 fi @@ -231,6 +231,7 @@ chmod -x /etc/grub.d/10_linux /usr/libexec/qubes-appmenus/remove-appvm-appmenus.sh /usr/share/qubes-appmenus/qubes-appmenu-select.desktop /usr/share/qubes-appmenus/qubes-dispvm-firefox.desktop +/usr/share/qubes-appmenus/qubes-dispvm-xterm.desktop /usr/share/qubes-appmenus/qubes-dispvm.directory /usr/share/qubes-appmenus/qubes-servicevm.directory.template /usr/share/qubes-appmenus/qubes-start.desktop