NetworkManager r3602 - in trunk: . initscript/Gentoo

[asaleem svn gnome org]

Author: asaleem
Date: Sun Apr 27 00:24:58 2008
New Revision: 3602
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3602&view=rev

Log:
fix starting of the daemon

Modified:
   trunk/ChangeLog
   trunk/initscript/Gentoo/NetworkManager.in

Modified: trunk/initscript/Gentoo/NetworkManager.in
==============================================================================
--- trunk/initscript/Gentoo/NetworkManager.in	(original)
+++ trunk/initscript/Gentoo/NetworkManager.in	Sun Apr 27 00:24:58 2008
@@ -9,20 +9,15 @@
 
 start() {
    ebegin "Starting NetworkManager"
-   start-stop-daemon --start --quiet --pidfile /var/run/NetworkManager.pid --exec /usr/sbin/NetworkManager
+   start-stop-daemon --start --quiet --pidfile /var/run/NetworkManager.pid \
+      --exec /usr/sbin/NetworkManager -- --pid-file /var/run/NetworkManager.pid
    eend $?
 }
 
 stop() {
-   local retval
-
    ebegin "Stopping NetworkManager"
    start-stop-daemon --stop --quiet --pidfile /var/run/NetworkManager.pid
-   retval=$?
-   eend ${retval}
-
-   [ -e /var/run/NetworkManager.pid ] && rm -f /var/run/NetworkManager.pid
-   return ${retval}
+   eend $?
 }
 
 # vim: set ft=gentoo-init-d ts=3 sw=3 et: