Disable forwarding of journal to syslog
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.
Tested: Verified journal no longer tries to forward
messgages on to syslog.
Resolves openbmc/openbmc#3299
Change-Id: Ic7a8e488b60e984670ab4de666f820eeffe39afb
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
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 ce58a53..fbd492b 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,12 +9,15 @@
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
new file mode 100644
index 0000000..c85bcea
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-forward-to-syslog.conf
@@ -0,0 +1,11 @@
+# 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