From f7ca44e336e520226ef5fc7f1de79be3206044ea Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Thu, 13 May 2021 15:16:37 +0000 Subject: 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 --- .../recipes-core/systemd/systemd/journald-size-policy-16MB.conf | 8 ++++++++ .../recipes-core/systemd/systemd/journald-size-policy-2MB.conf | 8 ++++++++ meta-ibm/recipes-core/systemd/systemd/journald-size-policy.conf | 8 -------- meta-ibm/recipes-core/systemd/systemd_%.bbappend | 8 ++++---- 4 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 meta-ibm/recipes-core/systemd/systemd/journald-size-policy-16MB.conf create mode 100644 meta-ibm/recipes-core/systemd/systemd/journald-size-policy-2MB.conf delete mode 100644 meta-ibm/recipes-core/systemd/systemd/journald-size-policy.conf (limited to 'meta-ibm') 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-2MB.conf b/meta-ibm/recipes-core/systemd/systemd/journald-size-policy-2MB.conf new file mode 100644 index 000000000..fb84c6734 --- /dev/null +++ b/meta-ibm/recipes-core/systemd/systemd/journald-size-policy-2MB.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=2.5M diff --git a/meta-ibm/recipes-core/systemd/systemd/journald-size-policy.conf b/meta-ibm/recipes-core/systemd/systemd/journald-size-policy.conf deleted file mode 100644 index fb84c6734..000000000 --- a/meta-ibm/recipes-core/systemd/systemd/journald-size-policy.conf +++ /dev/null @@ -1,8 +0,0 @@ -# This file overrides a default for journald -# -# - Set a maximum size for journald in filesystem -# -# See journald.conf(5) for details - -[Journal] -SystemMaxUse=2.5M 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 } -- cgit v1.2.3