Dr. Werner Fink 2011-11-07 10:06:00 +00:00 committed by Git OBS Bridge
parent 668d935ca3
commit 16030193cc
2 changed files with 8 additions and 3 deletions

View File

@ -110,7 +110,7 @@ syslog-ng)
;; ;;
rsyslogd) rsyslogd)
syslog=rsyslogd syslog=rsyslogd
config=/etc/rsyslog.early.conf config=/etc/rsyslog.conf
socksdir=/var/run/rsyslog socksdir=/var/run/rsyslog
socks=$socksdir/additional-log-sockets.conf socks=$socksdir/additional-log-sockets.conf
# #
@ -130,9 +130,9 @@ rsyslogd)
break break
esac esac
done < ${config} done < ${config}
test -n "$network" && config=/etc/rsyslog.conf test -z "$network" && config=/etc/rsyslog.early.conf
else else
config=/etc/rsyslog.conf config=/etc/rsyslog.early.conf
fi fi
if test -r "$config" ; then if test -r "$config" ; then
while read one two rest ; do while read one two rest ; do

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Nov 7 10:04:35 UTC 2011 - werner@suse.de
- Invert network/early logic for rsyslog (bnc#728565)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 24 08:29:15 UTC 2011 - werner@suse.de Mon Oct 24 08:29:15 UTC 2011 - werner@suse.de