[Pkg-utopia-commits] r681 - packages/experimental/networkmanager/debian

[Michael Biebl]

Author: mbiebl-guest
Date: 2006-02-28 18:43:34 +0000 (Tue, 28 Feb 2006)
New Revision: 681

Modified:
   packages/experimental/networkmanager/debian/network-manager-dispatcher.dbus-event
   packages/experimental/networkmanager/debian/network-manager.dbus-event
Log:
NM now has a pid-file option. So let's use it.


Modified: packages/experimental/networkmanager/debian/network-manager-dispatcher.dbus-event
===================================================================
--- packages/experimental/networkmanager/debian/network-manager-dispatcher.dbus-event	2006-02-28 18:10:39 UTC (rev 680)
+++ packages/experimental/networkmanager/debian/network-manager-dispatcher.dbus-event	2006-02-28 18:43:34 UTC (rev 681)
@@ -42,10 +42,9 @@
 	fi
 
 	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 $?
 }
 
 #

Modified: packages/experimental/networkmanager/debian/network-manager.dbus-event
===================================================================
--- packages/experimental/networkmanager/debian/network-manager.dbus-event	2006-02-28 18:10:39 UTC (rev 680)
+++ packages/experimental/networkmanager/debian/network-manager.dbus-event	2006-02-28 18:43:34 UTC (rev 681)
@@ -23,7 +23,6 @@
 
 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 @@
 	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 $?
 }
 
 #
@@ -76,11 +72,6 @@
             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
-
 }