Enable kernel logs in journal
At one point there were duplicate kernel logs going
into the journal. One was disabled (e9722d1) using systemd
configuration options. Not sure what changed but recently
no kernel messages have been going into the journal.
Testing: Verified that only one kernel message appears
in the journal with this change.
(From meta-phosphor rev: 9e5d2bf6d989261478ec0d17705bb883c84ad4a5)
Change-Id: I93bc90b53a0926c610304f73b567e56ad13a0ff1
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb b/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb
index ce58a53..930d447 100644
--- a/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb
+++ b/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy.bb
@@ -8,13 +8,10 @@
DEPENDS += "systemd"
SRC_URI = "file://service-restart-policy.conf"
-SRC_URI += "file://disable-duplicate-kernel-msg.conf"
FILES_${PN} += "${systemd_unitdir}/system.conf.d/service-restart-policy.conf"
-FILES_${PN} += "${systemd_unitdir}/journald.conf.d/disable-duplicate-kernel-msg.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
}
diff --git a/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-duplicate-kernel-msg.conf b/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-duplicate-kernel-msg.conf
deleted file mode 100644
index beb2f44..0000000
--- a/meta-phosphor/recipes-phosphor/systemd-policy/phosphor-systemd-policy/disable-duplicate-kernel-msg.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file overrides some defaults for systemd
-#
-# OpenBMC uses busybox which uses klogd which causes duplicate
-# kernel messages to show up in the journal due to syslog.
-# This override prevents journald from reading from kmsg so
-# only one instance of the kernel messages will show up in
-# journald instead of the two of each currently put in the
-# journal
-#
-# See systemd-system.conf(5) for details on the conf files
-
-[Journal]
-ReadKMsg=no