diff options
| author | Santosh Puranik <santosh.puranik@in.ibm.com> | 2019-05-22 15:37:24 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-05-29 17:58:23 +0300 |
| commit | 3e264b0f9ef78d60e27aef09724f131000dbd29b (patch) | |
| tree | e7ab15aca96278dd82382938dd022739f3f2d61f /meta-phosphor/recipes-extended/rsyslog | |
| parent | 3d7dfa8ac4678523c79f43b8caac2ea55dba349f (diff) | |
| download | openbmc-3e264b0f9ef78d60e27aef09724f131000dbd29b.tar.xz | |
rsyslogd: Install default server config
This reverts commit 37bc1a3568f2e87987be05243627a984dc051de1.
In addition, it changes the default rsyslog server config to
ignore all messages. Also bumps up phosphor-logging:
phosphor-logging: srcrev bump f59854e94b..0a0b5ea558
Santosh Puranik (1):
rsyslod: Change disable action
Tested:
Verified that the default rsyslog behavior is to now ignore
all messages.
(From meta-phosphor rev: 138108a05f68ada8b990024bbaa8b68b135d6aeb)
Signed-off-by: Santosh Puranik <santosh.puranik@in.ibm.com>
Change-Id: Iba11dfa153eaeef17417c82ab26f9a26fe5f9125
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-phosphor/recipes-extended/rsyslog')
3 files changed, 7 insertions, 3 deletions
diff --git a/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf b/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf deleted file mode 100644 index 458f52f27..000000000 --- a/meta-phosphor/recipes-extended/rsyslog/files/rsyslog-override.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Unit] -# 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 new file mode 100644 index 000000000..cf47ba306 --- /dev/null +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog/server.conf @@ -0,0 +1 @@ +*.* ~ diff --git a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend index 3901844ae..0a2fb3334 100644 --- a/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-phosphor/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -2,9 +2,15 @@ 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 +} |