Browse Source

Fix disabling nm-applet when NM is disabled

Marek Marczykowski-Górecki 10 years ago
parent
commit
756293ec75
2 changed files with 3 additions and 2 deletions
  1. 2 1
      vm-init.d/qubes-core-appvm
  2. 1 1
      vm-systemd/misc-post.sh

+ 2 - 1
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:"

+ 1 - 1
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