From 16030193cca60f0742dd1ec69c6bd60215bce0c25a97f51a14b16fa1b932b455 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 7 Nov 2011 10:06:00 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=70 --- syslog-service-generator | 6 +++--- syslogd.changes | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/syslog-service-generator b/syslog-service-generator index 0f96a04..b40b427 100644 --- a/syslog-service-generator +++ b/syslog-service-generator @@ -110,7 +110,7 @@ syslog-ng) ;; rsyslogd) syslog=rsyslogd - config=/etc/rsyslog.early.conf + config=/etc/rsyslog.conf socksdir=/var/run/rsyslog socks=$socksdir/additional-log-sockets.conf # @@ -130,9 +130,9 @@ rsyslogd) break esac done < ${config} - test -n "$network" && config=/etc/rsyslog.conf + test -z "$network" && config=/etc/rsyslog.early.conf else - config=/etc/rsyslog.conf + config=/etc/rsyslog.early.conf fi if test -r "$config" ; then while read one two rest ; do diff --git a/syslogd.changes b/syslogd.changes index 9b13c6d..70049af 100644 --- a/syslogd.changes +++ b/syslogd.changes @@ -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