From d5d156acbbbab454c1fc7bbd2e58a059fe51a2f5 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 11 Jun 2007 10:42:28 +0000
Subject: adding files needed by red hat package maintainer Peter Vrabec

---
 redhat/rsyslog.init      | 23 ++++++++++++++---------
 redhat/rsyslog.sysconfig | 12 ++++++++++++
 2 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 redhat/rsyslog.sysconfig

(limited to 'redhat')

diff --git a/redhat/rsyslog.init b/redhat/rsyslog.init
index 0a45a39f..28e50bf9 100644
--- a/redhat/rsyslog.init
+++ b/redhat/rsyslog.init
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# rsyslog        Starts rsyslogd/klogd.
+# rsyslog        Starts rsyslogd/rklogd.
 #
 #
 # chkconfig: 2345 12 88
@@ -8,14 +8,19 @@
 # messages to various system log files.  It is a good idea to always \
 # run rsyslog.
 ### BEGIN INIT INFO
-# Provides: $rsyslog
+# Provides: $syslog
+# Short-Description: Rsyslog, the enhanced syslogd for Linux and Unix 
+# Description: Rsyslog is an enhanced multi-threaded syslogd supporting, 
+#              among others, MySQL, syslog/tcp, RFC 3195, permitted 
+#              sender lists, filtering on any message part, and fine 
+#              grain output format control.
 ### END INIT INFO
 
 # Source function library.
 . /etc/init.d/functions
 
-[ -f /usr/sbin/rsyslogd ] || exit 0
-[ -f /sbin/klogd ] || exit 0
+[ -f /sbin/rsyslogd ] || exit 0
+[ -f /sbin/rklogd ] || exit 0
 
 # Source config
 if [ -f /etc/sysconfig/rsyslog ] ; then
@@ -34,15 +39,15 @@ start() {
         daemon rsyslogd $SYSLOGD_OPTIONS
         RETVAL=$?
         echo
-        echo -n $"Starting kernel logger: "
-        daemon klogd $KLOGD_OPTIONS
+        echo -n $"Starting kernel logger (rklogd): "
+        daemon rklogd $KLOGD_OPTIONS
         echo
         [ $RETVAL -eq 0 ] && touch /var/lock/subsys/rsyslog
         return $RETVAL
 }
 stop() {
-        echo -n $"Shutting down kernel logger: "
-        killproc klogd
+        echo -n $"Shutting down kernel logger (rklogd): "
+        killproc rklogd
         echo
         echo -n $"Shutting down system logger (rsyslog): "
         killproc rsyslogd
@@ -53,7 +58,7 @@ stop() {
 }
 rhstatus() {
         status rsyslogd
-        status klogd
+        status rklogd
 }
 restart() {
         stop
diff --git a/redhat/rsyslog.sysconfig b/redhat/rsyslog.sysconfig
new file mode 100644
index 00000000..ee9be79b
--- /dev/null
+++ b/redhat/rsyslog.sysconfig
@@ -0,0 +1,12 @@
+# Options to syslogd
+# -m 0 disables 'MARK' messages.
+# -r enables logging from remote machines
+# -x disables DNS lookups on messages recieved with -r
+# See syslogd(8) for more details
+SYSLOGD_OPTIONS="-m 0"
+# Options to klogd
+# -2 prints all kernel oops messages twice; once for klogd to decode, and
+#    once for processing with 'ksymoops'
+# -x disables all klogd processing of oops messages entirely
+# See klogd(8) for more details
+KLOGD_OPTIONS="-x"
-- 
cgit