ibm: Increase journal size for p10bmc

The p10bmc system uses a MMC flash chip with much larger storage than
a NOR chip. Increase the current journal size allocation from 2MB to 16MB
so that p1bmc saves more data for debug.

Tested: Verified that a witherspoon and p10bmc image had the expected
journal size file (2MB for witherspoon and 16MB for p10bmc) under
rootfs/lib/systemd/journald.conf.d/

Change-Id: Idcdb01bbf017c411c7b97406191e90774e8a8753
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>

3 files changed, 12 insertions, 4 deletions

diff --git a/meta-ibm/recipes-core/systemd/systemd/journald-size-policy-16MB.conf b/meta-ibm/recipes-core/systemd/systemd/journald-size-policy-16MB.conf
new file mode 100644
index 000000000..a9f1d5723
--- /dev/null
+++ b/meta-ibm/recipes-core/systemd/systemd/journald-size-policy-16MB.conf
@@ -0,0 +1,8 @@
+# This file overrides a default for journald
+#
+# - Set a maximum size for journald in filesystem
+#
+# See journald.conf(5) for details
+
+[Journal]
+SystemMaxUse=16M
diff --git a/meta-ibm/recipes-core/systemd/systemd/journald-size-policy.conf b/meta-ibm/recipes-core/systemd/systemd/journald-size-policy-2MB.conf
index fb84c6734..fb84c6734 100644
--- a/meta-ibm/recipes-core/systemd/systemd/journald-size-policy.conf
+++ b/meta-ibm/recipes-core/systemd/systemd/journald-size-policy-2MB.conf
diff --git a/meta-ibm/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/recipes-core/systemd/systemd_%.bbappend
index a6ef71d29..3e490153d 100644
--- a/meta-ibm/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-ibm/recipes-core/systemd/systemd_%.bbappend
@@ -1,11 +1,11 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI_append_ibm-ac-server = " file://journald-storage-policy.conf"
 SRC_URI_append_ibm-ac-server = " file://systemd-journald-override.conf"
-SRC_URI_append_ibm-ac-server = " file://journald-size-policy.conf"
+SRC_URI_append_ibm-ac-server = " file://journald-size-policy-2MB.conf"
 
 SRC_URI_append_p10bmc = " file://journald-storage-policy.conf"
 SRC_URI_append_p10bmc = " file://systemd-journald-override.conf"
-SRC_URI_append_p10bmc = " file://journald-size-policy.conf"
+SRC_URI_append_p10bmc = " file://journald-size-policy-16MB.conf"
 
 FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf"
 FILES_${PN}_append_ibm-ac-server = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf"
@@ -18,10 +18,10 @@ FILES_${PN}_append_p10bmc = " ${systemd_unitdir}/journald.conf.d/journald-size-p
 do_install_append_ibm-ac-server() {
         install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf
         install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf
-        install -m 644 -D ${WORKDIR}/journald-size-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf
+        install -m 644 -D ${WORKDIR}/journald-size-policy-2MB.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf
 }
 do_install_append_p10bmc() {
         install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf
         install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf
-        install -m 644 -D ${WORKDIR}/journald-size-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf
+        install -m 644 -D ${WORKDIR}/journald-size-policy-16MB.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf
 }