SOURCES: syslog-ng2.init - restored rev. 1.18 - 1.20

[gotar]

Author: gotar                        Date: Tue Mar 31 14:14:12 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- restored rev. 1.18 - 1.20

---- Files affected:
SOURCES:
   syslog-ng2.init (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SOURCES/syslog-ng2.init
diff -u SOURCES/syslog-ng2.init:1.29 SOURCES/syslog-ng2.init:1.30
--- SOURCES/syslog-ng2.init:1.29	Tue Mar 31 16:03:20 2009
+++ SOURCES/syslog-ng2.init	Tue Mar 31 16:14:06 2009
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# syslog	Starts syslog-ng (syslogd replacment).
+# syslog	Starts syslog-ng (syslogd replacement).
 #
 # chkconfig:	2345 30 70
 # description:	Syslog is the facility by which many daemons use to log \
@@ -29,7 +29,7 @@
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/syslog-ng ]; then
 		msg_starting "syslog-ng"
-		daemon syslog-ng $OPTIONS
+		daemon /usr/sbin/syslog-ng $OPTIONS
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/syslog-ng
 	else
@@ -47,23 +47,33 @@
 	fi
 }
 
+condrestart() {
+	if [ -f /var/lock/subsys/syslog-ng ]; then
+		stop
+		start
+	else
+		msg_not_running syslog-ng
+		RETVAL=$1
+	fi
+}
+
 RETVAL=0
 # See how we were called.
 case "$1" in
   start)
-  	start
+	start
 	;;
   stop)
-  	stop
+	stop
 	;;
   restart)
-	configtest 
+	configtest
 	stop
 	start
 	;;
-  configtest)
+  try-restart)
 	configtest
-	exit $?
+	condrestart 0
 	;;
   reload|force-reload)
 	if [ -f /var/lock/subsys/syslog-ng ]; then
@@ -96,12 +106,16 @@
 		fi
 	fi
 	;;
+  configtest)
+	configtest
+	exit $?
+	;;
   status)
 	status syslog-ng
 	exit $?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status|configtest|flush-logs}"
 	exit 3
 esac
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/syslog-ng2.init?r1=1.29&r2=1.30&f=u