diff options
| author | Deepak Kodihalli <dkodihal@in.ibm.com> | 2018-08-10 08:27:22 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-30 21:13:57 -0400 |
| commit | c5d78090a27b524d4873a23d4082082e0fde2622 (patch) | |
| tree | 6b6f94ed5960ad908472e172cbe4a5f3a9a0a7ea | |
| parent | 7e94a7ed8e0611051bdb087303f34eba25ed8fc5 (diff) | |
| download | talos-openbmc-c5d78090a27b524d4873a23d4082082e0fde2622.tar.gz talos-openbmc-c5d78090a27b524d4873a23d4082082e0fde2622.zip | |
Revert "Disable forwarding of journal to syslog"
This reverts commit cffe1bf83203854489e7b8bab81c9188143f7ab5.
This is to enable syslog daemons to forward journal logs to a remote
server.
(From meta-phosphor rev: 03f3dbd09e50b6e63418118df6e2267a2ba650bc)
Change-Id: Ie1ff86a2f48e77227eda60f2f047e6f33ff7b01c
Signed-off-by: Deepak Kodihalli <dkodihal@in.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
2 files changed, 0 insertions, 14 deletions
diff --git a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb b/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb index fbd492b7d..ce58a532a 100644 --- a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb +++ b/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb @@ -9,15 +9,12 @@ DEPENDS += "systemd" SRC_URI = "file://service-restart-policy.conf" SRC_URI += "file://disable-duplicate-kernel-msg.conf" -SRC_URI += "file://disable-forward-to-syslog.conf" FILES_${PN} += "${systemd_unitdir}/system.conf.d/service-restart-policy.conf" FILES_${PN} += "${systemd_unitdir}/journald.conf.d/disable-duplicate-kernel-msg.conf" -FILES_${PN} += "${systemd_unitdir}/journald.conf.d/disable-forward-to-syslog.conf" do_install() { install -m 644 -D ${WORKDIR}/service-restart-policy.conf ${D}${systemd_unitdir}/system.conf.d/service-restart-policy.conf install -m 644 -D ${WORKDIR}/disable-duplicate-kernel-msg.conf ${D}${systemd_unitdir}/journald.conf.d/disable-duplicate-kernel-msg.conf - install -m 644 -D ${WORKDIR}/disable-forward-to-syslog.conf ${D}${systemd_unitdir}/journald.conf.d/disable-forward-to-syslog.conf } diff --git a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-forward-to-syslog.conf b/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-forward-to-syslog.conf deleted file mode 100644 index c85bceade..000000000 --- a/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-forward-to-syslog.conf +++ /dev/null @@ -1,11 +0,0 @@ -# This file overrides some defaults for systemd -# -# systemd recently changed the default in their recipe -# to forward all messages on to syslog. OpenBMC runs in -# a constrained environment so the redundancy of having -# the logs in both journald and syslog does not make sense. -# -# See systemd-system.conf(5) for details on the conf files - -[Journal] -ForwardToSyslog=no |
