diff options
| author | Dan Williams <dcbw@redhat.com> | 2006-02-27 05:50:28 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2006-02-27 05:50:28 +0000 |
| commit | e64e90cd3b105011914890642bb5ee11042ec246 (patch) | |
| tree | ae0f129db8af2e5397d0d1bb45b13af643d02c1c /initscript | |
| parent | b06df42628e37f8f1badc10f0341746b536333c1 (diff) | |
2006-02-27 Dan Williams <dcbw@redhat.com>
* dispatcher-daemon/NetworkManagerDispatcher.c
- Accept --pid-file with a path to a pidfile, write it out on
startup, and delete it on shutdown
* src/NetworkManager.c
- Accept --pid-file with a path to a pidfile, write it out on
startup, and delete it on shutdown
- Move nm_print_usage() lower
* initscripts/RedHat/NetworkManager.in
- Use new --pid-file option
- Fix service stopping to wait a bit for NM to quit
* initscripts/RedHat/NetworkManagerDispatcher.in
- Use new --pid-file option
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1500 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'initscript')
| -rwxr-xr-x | initscript/RedHat/NetworkManager.in | 7 | ||||
| -rwxr-xr-x | initscript/RedHat/NetworkManagerDispatcher.in | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/initscript/RedHat/NetworkManager.in b/initscript/RedHat/NetworkManager.in index ea7475de..4add42f5 100755 --- a/initscript/RedHat/NetworkManager.in +++ b/initscript/RedHat/NetworkManager.in @@ -37,17 +37,16 @@ start() echo $"Setting network parameters... " sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 echo -n $"Starting NetworkManager daemon: " - daemon --check $servicename $processname + daemon --check $servicename $processname --pid-file=$pidfile RETVAL=$? echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename && echo `/sbin/pidof $processname` > $pidfile + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename } stop() { echo -n $"Stopping NetworkManager daemon: " - - killproc $servicename -TERM + killproc -p $pidfile $servicename RETVAL=$? echo if [ $RETVAL -eq 0 ]; then diff --git a/initscript/RedHat/NetworkManagerDispatcher.in b/initscript/RedHat/NetworkManagerDispatcher.in index f3918109..31652d67 100755 --- a/initscript/RedHat/NetworkManagerDispatcher.in +++ b/initscript/RedHat/NetworkManagerDispatcher.in @@ -32,16 +32,15 @@ RETVAL=0 start() { echo -n $"Starting NetworkManagerDispatcher daemon: " - daemon --check $servicename $processname + daemon --check $servicename $processname --pid-file=$pidfile RETVAL=$? echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename && echo `/sbin/pidof $processname` > $pidfile + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename } stop() { echo -n $"Stopping NetworkManagerDispatcher daemon: " - killproc $servicename -TERM RETVAL=$? echo |