diff options
| author | Deepak Kodihalli <dkodihal@in.ibm.com> | 2019-01-11 15:09:04 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-12 01:29:14 +0300 |
| commit | 9d06b024f5bc9489959075b0d1ae009653fdd4e5 (patch) | |
| tree | 10c8520df218ca9342975bbd629f4938158b95e5 /meta-phosphor/recipes-extended/rsyslog | |
| parent | 58facfdbc507f53d72a167e89d84f73c181b09a4 (diff) | |
| download | openbmc-9d06b024f5bc9489959075b0d1ae009653fdd4e5.tar.xz | |
rsyslogd: don't start without actions
Rsyslog is currently used only for remote logging. The daemon would run
though (started by systemd) even when remote logging has not been
configured. In other words, it would run without any actions.
With Yocto 2.6, rsyslogd won't run without any actions. Hence, start
rsyslogd on demand - only when remote logging is configured.
(From meta-phosphor rev: 37bc1a3568f2e87987be05243627a984dc051de1)
Change-Id: Ic895ea80b2fb2537a25d1d40d4ae156f3d95c629
Signed-off-by: Deepak Kodihalli <dkodihal@in.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-extended/rsyslog')
3 files changed, 2 insertions, 8 deletions
diff --git a/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf b/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf index d5084b11c6..faeeae0c45 100644 --- a/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf +++ b/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf @@ -2,3 +2,5 @@ # This service is restarted when an rsyslog property is set, so # disable rate limiting to allow it to always be restarted. StartLimitIntervalSec=0 +# This file exists only if remote logging has been configured +ConditionPathExists=/etc/rsyslog.d/server.conf diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf b/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf deleted file mode 100644 index 5c8161b29a..0000000000 --- a/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Remote Logging (we use TCP for reliable delivery) -#*.* @@remote-host:port diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend index 0a2fb33343..3901844ae5 100644 --- a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -2,15 +2,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://rsyslog.conf \ - file://server.conf \ " PACKAGECONFIG ??= " \ rsyslogd rsyslogrt inet regexp uuid \ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ " - -do_install_append(){ - install -m 0644 -D ${WORKDIR}/server.conf \ - ${D}${sysconfdir}/rsyslog.d/server.conf -} |