first debian release of NM 0.6 (taken from the experimental branch)

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

1 files changed, 4 insertions, 18 deletions

diff --git a/debian/network-manager.dbus-event b/debian/network-manager.dbus-event
index f18ea28e..d26d18f4 100644
--- a/debian/network-manager.dbus-event
+++ b/debian/network-manager.dbus-event
@@ -23,7 +23,6 @@ DAEMON=/usr/sbin/$NAME
 
 PIDDIR=/var/run/NetworkManager
 PIDFILE=$PIDDIR/$NAME.pid
-NAMED_PIDFILE=/var/lib/NetworkManager/NetworkManager-pid-named
 
 SCRIPTNAME=/etc/dbus-1/event.d/25$NAME
 USER=root
@@ -54,12 +53,9 @@ d_start() {
 	chmod 755 /var/lib/NetworkManager
 
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-		--user $USER --exec $DAEMON -- $DAEMON_OPTS
-    RETVAL=$?
-	log_end_msg $RETVAL
-    [ $RETVAL -eq 0 ] && echo `/bin/pidof $NAME` > $PIDFILE
-
-
+		--user $USER --exec $DAEMON -- $DAEMON_OPTS --pid-file $PIDFILE
+		
+	log_end_msg $?
 }
 
 #
@@ -69,18 +65,8 @@ d_stop() {
         log_begin_msg "Stopping $DESC"
 	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
 		 --oknodo --user $USER --exec $DAEMON
+		 
         log_end_msg $?
-
-        # if NetworkManager does not want to die, apply some more force
-        if [ -e $PIDFILE ]; then
-            kill -9 $(cat $PIDFILE) || true
-            rm -f $PIDFILE
-        fi
-        if [ -e $NAMED_PIDFILE ]; then
-            kill -9 $(cat $NAMED_PIDFILE) || true
-            rm -f $NAMED_PIDFILE
-        fi
-
 }