- var/lock/subsys/syslog -> syslog-ng

- removed unnecessary part of force-reload

Changed files:
    syslog-ng.init -> 1.6

diff --git a/syslog-ng.init b/syslog-ng.init
index f99bdf1f383f142f1abf82b05fa536b7157268f6..c1f01644174886d9d544d64b156005c73bc0af1e 100644 (file)
--- a/syslog-ng.init
+++ b/syslog-ng.init
@@ -31,20 +31,20 @@ fi
 case "$1" in
   start)
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/syslog ]; then
+       if [ ! -f /var/lock/subsys/syslog-ng ]; then
                msg_starting "syslog-ng"
                daemon syslog-ng $OPTIONS
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
        else
                msg_Already_Running "syslog-ng"
        fi
        ;;
     stop)      
-       if [ -f /var/lock/subsys/syslog ]; then
+       if [ -f /var/lock/subsys/syslog-ng ]; then
                msg_stopping "syslog-ng"
                killproc syslog-ng
-               rm -f /var/lock/subsys/syslog >/dev/null 2>&1
+               rm -f /var/lock/subsys/syslog-ng >/dev/null 2>&1
        else
                msg_Not_Running syslog-ng
                exit 1
@@ -58,7 +58,7 @@ case "$1" in
        $0 start
        ;;
   reload)
-       if [ -f /var/lock/subsys/syslog ]; then
+       if [ -f /var/lock/subsys/syslog-ng ]; then
                msg_reloading "syslog-ng"
                killproc syslog-ng -HUP
        else
@@ -69,10 +69,6 @@ case "$1" in
   force-reload)
        $0 reload
        exit $?
-
-       # or if it doesn't
-       $0 stop && $0 start
-       exit $?
        ;;
   *)
        msg_Usage "$0 {start|stop|status|restart|reload|force-reload}"