From 311bc4cee9d87d60f756f15fcd03b3ad1b0b60d621c7cfe5d250ed281662f022 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 10 Sep 2009 10:59:22 +0000
Subject: [PATCH] checked in

OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=8
---
 rc.syslog        |  3 +--
 sysconfig.syslog |  4 ++--
 syslog.8         | 16 +++-------------
 syslogd.changes  |  7 -------
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/rc.syslog b/rc.syslog
index 2a2b366..c3d0d4c 100644
--- a/rc.syslog
+++ b/rc.syslog
@@ -45,8 +45,7 @@ case "$SYSLOG_DAEMON" in
 	else
 	    config=/etc/rsyslog.conf
 	fi
-	compat=${RSYSLOGD_COMPAT_VERSION:-${RSYSLOGD_NATIVE_VERSION}}
-	params="-c ${compat:-3} -f $config $RSYSLOGD_PARAMS"
+	params="-c ${RSYSLOGD_COMPAT_VERSION:=3} -f $config $RSYSLOGD_PARAMS"
 	rsocks="/var/run/rsyslog/additional-log-sockets.conf"
 	test -r "$config" && \
 	while read one two rest ; do
diff --git a/sysconfig.syslog b/sysconfig.syslog
index d64c37a..ca66cc2 100644
--- a/sysconfig.syslog
+++ b/sysconfig.syslog
@@ -29,12 +29,12 @@ SYSLOGD_PARAMS=""
 #
 KLOGD_PARAMS="-x"
 
-## Type:		list(syslogd,syslog-ng,rsyslogd,"")
+## Type:		list(syslogd,syslog-ng,"")
 ## Default:		""
 ## Config:		""
 ## ServiceRestart:	syslog
 #
 # The name of the syslog daemon to use as syslog service:
-# "syslogd", "syslog-ng", "rsyslogd" or "" for autodetect.
+# "syslogd", "syslog-ng" or "" for autodetect.
 #
 SYSLOG_DAEMON=""
diff --git a/syslog.8 b/syslog.8
index bbac1de..67c651b 100644
--- a/syslog.8
+++ b/syslog.8
@@ -10,15 +10,9 @@ supported as the system's syslog service, currently
 .IR syslogd ,
 .IR syslog-ng \ and
 .IR rsyslogd
-
-The first installed daemon activates itself for the
-syslog service. Starting with openSUSE-11.2,
-it is
-.IR rsyslogd ,
-before it was
-.IR syslog-ng .
-But this depends on the software selection during
-the installation.
+By default
+.IR syslog-ng
+is installed and enabled.
 
 The name of the daemon used as syslog service is
 specified in the
@@ -27,10 +21,6 @@ specified in the
 variable in
 .BR /etc/sysconfig/syslog .
 
-The \fIyast2 sysconfig\fR module provides a comfortable
-way to switch to another installed daemon and restart
-the service.
-
 The
 .BR /etc/init.d/syslog
 init script is able to handle all supported daemons.
diff --git a/syslogd.changes b/syslogd.changes
index ff065f7..65eed61 100644
--- a/syslogd.changes
+++ b/syslogd.changes
@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-Wed Sep  9 21:47:47 CEST 2009 - mt@suse.de
-
-- Added rsyslogd to the list of daemons in SYSLOG_DAEMON variable
-  meta-data in sysconfig/syslog file, updated syslog.8 man page,
-  improved rsyslogd native mode usage in the syslog init-script.
-
 -------------------------------------------------------------------
 Tue Aug 11 23:47:12 CEST 2009 - jeffm@suse.de