* debian/network-manager.init

  - Kill the D-Bus activated nm-system-settings daemon on "stop". Update
    README.Debian accordingly.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3293 ceb527fc-18e6-0310-9fe2-813c157c29e7

3 files changed, 11 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index feb11ab7..ef78bb5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ network-manager (0.7.2-1) UNRELEASED; urgency=low
     - 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@debian.org>  Tue, 24 Nov 2009 00:34:08 +0100
 
diff --git a/debian/network-manager.README.Debian b/debian/network-manager.README.Debian
index 0f52b41e..90c3aa6d 100644
--- a/debian/network-manager.README.Debian
+++ b/debian/network-manager.README.Debian
@@ -37,7 +37,8 @@ wireless devices.
 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
diff --git a/debian/network-manager.init b/debian/network-manager.init
index 0771e530..250971bb 100644
--- a/debian/network-manager.init
+++ b/debian/network-manager.init
@@ -23,7 +23,6 @@ DAEMON=/usr/sbin/$NAME
 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 @@ test -f /etc/default/NetworkManager && . /etc/default/NetworkManager
 #
 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_start() {
 #
 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
 }