From daa6d9f4c2cb8aa303903c200cd6c82ffc8c60c6 Mon Sep 17 00:00:00 2001
From: Tomas Heinrich <theinric@fedoraproject.org>
Date: Sep 14 2009 16:54:26 +0000
Subject: adjust init script according to guidelines (#522071)


---

diff --git a/rsyslog.init b/rsyslog.init
index 5da2679..f0ba032 100644
--- a/rsyslog.init
+++ b/rsyslog.init
@@ -24,9 +24,14 @@
 . /etc/init.d/functions
 
 RETVAL=0
+PIDFILE=/var/run/syslogd.pid
+
+prog=rsyslogd
+exec=/sbin/rsyslogd
+lockfile=/var/lock/subsys/$prog
 
 start() {
-	[ -x /sbin/rsyslogd ] || exit 5
+	[ -x $exec ] || exit 5
 
 	# Source config
         if [ -f /etc/sysconfig/rsyslog ] ; then
@@ -35,23 +40,23 @@ start() {
 	umask 077
 
         echo -n $"Starting system logger: "
-        daemon rsyslogd $SYSLOGD_OPTIONS
+        daemon --pidfile="${PIDFILE}" $exec $SYSLOGD_OPTIONS
         RETVAL=$?
         echo
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/rsyslog
+        [ $RETVAL -eq 0 ] && touch $lockfile
         return $RETVAL
 }
 stop() {
         echo -n $"Shutting down system logger: "
-        killproc rsyslogd
+        killproc $prog
         RETVAL=$?
         echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rsyslog
+        [ $RETVAL -eq 0 ] && rm -f $lockfile
         return $RETVAL
 }
 reload()  {
     RETVAL=1
-    syslog=`cat /var/run/syslogd.pid 2>/dev/null`
+    syslog=$(cat "${PIDFILE}" 2>/dev/null)
     echo -n "Reloading system logger..."
     if [ -n "${syslog}" ] && [ -e /proc/"${syslog}" ]; then
 	kill -HUP "$syslog";
@@ -66,7 +71,7 @@ reload()  {
     return $RETVAL
 }
 rhstatus() {
-        status rsyslogd
+        status -p "${PIDFILE}" $prog
 }
 restart() {
         stop
@@ -89,12 +94,13 @@ case "$1" in
   status)
         rhstatus
         ;;
-  condrestart)
-        [ -f /var/lock/subsys/rsyslog ] && restart || :
+  condrestart|try-restart)
+        rhstatus >/dev/null 2>&1 || exit 0
+        restart
         ;;
   *)
-        echo $"Usage: $0 {start|stop|restart|reload|force-reload|condrestart}"
-        exit 2
+        echo $"Usage: $0 {start|stop|restart|condrestart|try-restart|reload|force-reload|status}"
+        exit 3
 esac
 
 exit $?
diff --git a/rsyslog.spec b/rsyslog.spec
index 69df773..a413a49 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -3,7 +3,7 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 4.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -194,6 +194,9 @@ fi
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Mon Sep 14 2009 Tomas Heinrich <theinric@redhat.com> 4.4.1-2
+- adjust init script according to guidelines (#522071)
+
 * Thu Sep 03 2009 Tomas Heinrich <theinric@redhat.com> 4.4.1-1
 - upgrade to new upstream stable version