OBS User autobuild 2009-09-10 10:59:22 +00:00 committed by Git OBS Bridge
parent 44ea97b2dc
commit 311bc4cee9
4 changed files with 6 additions and 24 deletions

View File

@ -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

View File

@ -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=""

View File

@ -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.

View File

@ -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