From 756293ec75e75f1f3a62bb28c14caa13f95be30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 30 Nov 2014 16:43:11 +0100 Subject: [PATCH] Fix disabling nm-applet when NM is disabled --- vm-init.d/qubes-core-appvm | 3 ++- vm-systemd/misc-post.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/vm-init.d/qubes-core-appvm b/vm-init.d/qubes-core-appvm index 00366bd..02ec92c 100755 --- a/vm-init.d/qubes-core-appvm +++ b/vm-init.d/qubes-core-appvm @@ -34,7 +34,8 @@ start() sed -i -e '/^NotShowIn=.*QUBES/s/;QUBES//' /etc/xdg/autostart/print-applet.desktop else # Disable notification icon - sed -i -e '/QUBES/!s/^NotShowIn=.*/\1QUBES;/' /etc/xdg/autostart/print-applet.desktop + sed -i -e '/QUBES/!s/^NotShowIn=\(.*\)/NotShowIn=QUBES;\1/' /etc/xdg/autostart/print-applet.desktop + fi echo -n $"Executing Qubes Core scripts for AppVM:" diff --git a/vm-systemd/misc-post.sh b/vm-systemd/misc-post.sh index e92de48..27b07e2 100755 --- a/vm-systemd/misc-post.sh +++ b/vm-systemd/misc-post.sh @@ -67,7 +67,7 @@ if [ ! -f /etc/systemd/system/cups.service ]; then sed -i -e '/^NotShowIn=.*QUBES/s/;QUBES//' /etc/xdg/autostart/print-applet.desktop else # Disable notification icon - sed -i -e '/QUBES/!s/^NotShowIn=.*/\1QUBES;/' /etc/xdg/autostart/print-applet.desktop + sed -i -e '/QUBES/!s/^NotShowIn=\(.*\)/NotShowIn=QUBES;\1/' /etc/xdg/autostart/print-applet.desktop fi fi if [ -f /var/run/qubes-service/network-manager ]; then