diff --git a/rc.syslog b/rc.syslog index c3d0d4c..2a2b366 100644 --- a/rc.syslog +++ b/rc.syslog @@ -45,7 +45,8 @@ case "$SYSLOG_DAEMON" in else config=/etc/rsyslog.conf fi - params="-c ${RSYSLOGD_COMPAT_VERSION:=3} -f $config $RSYSLOGD_PARAMS" + compat=${RSYSLOGD_COMPAT_VERSION:-${RSYSLOGD_NATIVE_VERSION}} + params="-c ${compat:-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 ca66cc2..d64c37a 100644 --- a/sysconfig.syslog +++ b/sysconfig.syslog @@ -29,12 +29,12 @@ SYSLOGD_PARAMS="" # KLOGD_PARAMS="-x" -## Type: list(syslogd,syslog-ng,"") +## Type: list(syslogd,syslog-ng,rsyslogd,"") ## Default: "" ## Config: "" ## ServiceRestart: syslog # # The name of the syslog daemon to use as syslog service: -# "syslogd", "syslog-ng" or "" for autodetect. +# "syslogd", "syslog-ng", "rsyslogd" or "" for autodetect. # SYSLOG_DAEMON="" diff --git a/syslog.8 b/syslog.8 index 67c651b..bbac1de 100644 --- a/syslog.8 +++ b/syslog.8 @@ -10,9 +10,15 @@ supported as the system's syslog service, currently .IR syslogd , .IR syslog-ng \ and .IR rsyslogd -By default -.IR syslog-ng -is installed and enabled. + +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. The name of the daemon used as syslog service is specified in the @@ -21,6 +27,10 @@ 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 65eed61..ff065f7 100644 --- a/syslogd.changes +++ b/syslogd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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