| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame^] | 1 | --- watchdog-5.13.orig/redhat/watchdog.init 2014-11-12 17:18:39.125943000 +0100 |
| 2 | +++ watchdog-5.13/redhat/watchdog.init 2014-11-12 18:27:36.189943000 +0100 |
| 3 | @@ -7,7 +7,7 @@ |
| 4 | # Henning P. Schmiedehausen <hps@tanstaafl.de> |
| 5 | |
| 6 | # Source function library. |
| 7 | -. /etc/rc.d/init.d/functions |
| 8 | +. /etc/init.d/functions |
| 9 | |
| 10 | [ -x /usr/sbin/watchdog -a -e /etc/watchdog.conf ] || exit 0 |
| 11 | |
| 12 | @@ -23,22 +23,22 @@ |
| 13 | |
| 14 | start() { |
| 15 | |
| 16 | - echo -n $"Starting $prog: " |
| 17 | + echo -n "Starting $prog: " |
| 18 | if [ -n "$(pidofproc $prog)" ]; then |
| 19 | - echo -n $"$prog: already running" |
| 20 | - echo_failure |
| 21 | + echo -n "$prog: already running " |
| 22 | + failure |
| 23 | echo |
| 24 | return 1 |
| 25 | fi |
| 26 | if [ "$VERBOSE" = "yes" ]; then |
| 27 | - daemon /usr/sbin/${prog} -v |
| 28 | + /usr/sbin/${prog} -v |
| 29 | else |
| 30 | - daemon /usr/sbin/${prog} |
| 31 | + /usr/sbin/${prog} |
| 32 | fi |
| 33 | RETVAL=$? |
| 34 | [ $RETVAL -eq 0 ] && touch $lockfile |
| 35 | - [ $RETVAL -eq 0 ] && echo_success |
| 36 | - [ $RETVAL -ne 0 ] && echo_failure |
| 37 | + [ $RETVAL -eq 0 ] && success |
| 38 | + [ $RETVAL -ne 0 ] && failure |
| 39 | echo |
| 40 | return $RETVAL |
| 41 | } |
| 42 | @@ -50,8 +50,10 @@ |
| 43 | # and reboot the box. |
| 44 | killproc $prog -TERM |
| 45 | RETVAL=$? |
| 46 | - echo |
| 47 | [ $RETVAL -eq 0 ] && rm -f $lockfile $pidfile |
| 48 | + [ $RETVAL -eq 0 ] && success |
| 49 | + [ $RETVAL -ne 0 ] && failure |
| 50 | + echo |
| 51 | return $RETVAL |
| 52 | } |
| 53 | |