[Pkg-utopia-commits] r3293 - in /packages/unstable/networkmanager/debian: changelog network-manager.README.Debian network-manager.init

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Nov 24 23:09:32 2009
New Revision: 3293

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3293
Log:
* debian/network-manager.init
  - Kill the D-Bus activated nm-system-settings daemon on "stop". Update
    README.Debian accordingly.

Modified:
    packages/unstable/networkmanager/debian/changelog
    packages/unstable/networkmanager/debian/network-manager.README.Debian
    packages/unstable/networkmanager/debian/network-manager.init

Modified: packages/unstable/networkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/changelog?rev=3293&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/changelog (original)
+++ packages/unstable/networkmanager/debian/changelog Tue Nov 24 23:09:32 2009
@@ -17,6 +17,9 @@
     - Bump Standards-Version to 3.8.3. No further changes.
   * debian/network-manager.install
     - Make sure we install all udev rules files.
+  * debian/network-manager.init
+    - Kill the D-Bus activated nm-system-settings daemon on "stop". Update
+      README.Debian accordingly.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 24 Nov 2009 00:34:08 +0100
 

Modified: packages/unstable/networkmanager/debian/network-manager.README.Debian
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/network-manager.README.Debian?rev=3293&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/network-manager.README.Debian (original)
+++ packages/unstable/networkmanager/debian/network-manager.README.Debian Tue Nov 24 23:09:32 2009
@@ -37,7 +37,8 @@
 After modifying /etc/NetworkManager/nm-systems-settings.conf _or_
 /etc/network/interfaces you may want to restart the system-settings daemon
 using the command:
-"sudo killall nm-system-settings" to apply those changes.
+"sudo killall nm-system-settings" or by running
+"sudo service network-manager restart".
 
 
 Dial-up configuration

Modified: packages/unstable/networkmanager/debian/network-manager.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/networkmanager/debian/network-manager.init?rev=3293&op=diff
==============================================================================
--- packages/unstable/networkmanager/debian/network-manager.init (original)
+++ packages/unstable/networkmanager/debian/network-manager.init Tue Nov 24 23:09:32 2009
@@ -23,7 +23,6 @@
 PIDFILE=/var/run/$NAME.pid
 
 SCRIPTNAME=/etc/init.d/network-manager
-USER=root
 
 # Gracefully exit if the package has been removed.
 test -x $DAEMON || exit 0
@@ -37,8 +36,7 @@
 #
 d_start() {
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--oknodo --user $USER --exec $DAEMON -- $DAEMON_OPTS
-		
+		--oknodo --exec $DAEMON -- $DAEMON_OPTS
 }
 
 #
@@ -46,8 +44,11 @@
 #
 d_stop() {
 	start-stop-daemon --stop --retry 5 --quiet --pidfile $PIDFILE \
-		 --oknodo --user $USER --exec $DAEMON
-		 
+		 --oknodo --exec $DAEMON
+
+	# kill the system settings daemon
+	start-stop-daemon --stop --retry 5 --quiet \
+		 --oknodo --exec /usr/sbin/nm-system-settings
 }