diff options
| author | Tim Bielawa <timbielawa@gmail.com> | 2008-12-15 09:17:33 -0500 |
|---|---|---|
| committer | Adrian Likins <alikins@redhat.com> | 2008-12-15 09:17:33 -0500 |
| commit | 376160f3f4092325203847c3e725fe278f2fc0d5 (patch) | |
| tree | f3dd2454c77168f3d45eed7f47b6277af3316b65 | |
| parent | 5d8711956d9053799a97e8d71fe65725bff881ab (diff) | |
| download | func-376160f3f4092325203847c3e725fe278f2fc0d5.tar.gz func-376160f3f4092325203847c3e725fe278f2fc0d5.tar.xz func-376160f3f4092325203847c3e725fe278f2fc0d5.zip | |
make init script work on debian/ubuntu
patch from Tim Bielawa <timbielawa@gmail.com>
| -rwxr-xr-x | init-scripts/funcd | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/init-scripts/funcd b/init-scripts/funcd index 223a7b6..c0c54b0 100755 --- a/init-scripts/funcd +++ b/init-scripts/funcd @@ -66,22 +66,38 @@ fi RETVAL=0 start() { - echo -n $"Starting func daemon: " - START_DAEMON $DAEMON $CONFIG_ARGS - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE - return $RETVAL + if [ -f /etc/debian_version ]; then + log_begin_msg "Starting func daemon: " + start-stop-daemon --exec $DAEMON --start --quiet -- $CONFIG_ARGS > /dev/null + RETVAL=$? + log_end_msg $RETVAL + return $RETVAL + else + echo -n $"Starting func daemon: " + START_DAEMON $DAEMON $CONFIG_ARGS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE + return $RETVAL + fi } stop() { - echo -n $"Stopping func daemon: " - killproc $PROCESS - RETVAL=$? - echo - if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/$SERVICE - rm -f /var/run/$SERVICE.pid + if [ -f /etc/debian_version ]; then + log_daemon_msg "Stopping func daemon" "funcd" + start-stop-daemon --stop --quiet --pidfile /var/run/funcd.pid --name funcd + RETVAL=$? + log_end_msg $RETVAL + rm -f /var/run/funcd.pid + else + echo -n $"Stopping func daemon: " + killproc $PROCESS + RETVAL=$? + echo + if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/$SERVICE + rm -f /var/run/$SERVICE.pid + fi fi } |