From 6dc89ddc9d43c219d5fa968f0d2efbec6de4c882 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 27 Apr 2008 00:24:58 +0000 Subject: fix starting of the daemon git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3602 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ initscript/Gentoo/NetworkManager.in | 11 +++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e4387ce72..701ea1582e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-04-26 Saleem Abdulrasool + + * initscript/Gentoo/NetworkManager.in: + Fix for starting the daemon. + 2008-04-25 Dan Williams Patch from Benoit Boissinot diff --git a/initscript/Gentoo/NetworkManager.in b/initscript/Gentoo/NetworkManager.in index 9b23185b31..0af2f69c65 100755 --- a/initscript/Gentoo/NetworkManager.in +++ b/initscript/Gentoo/NetworkManager.in @@ -9,20 +9,15 @@ depend() { 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: -- cgit v1.2.1