From 6978e2b934a209884b74caf57cb3db08800ada51 Mon Sep 17 00:00:00 2001 From: steve Date: Fri, 28 Jul 2023 17:36:08 +0800 Subject: [PATCH 1/2] Enable journal persistence for Mihawk Signed-off-by: Steve_LL_Chen --- .../recipes-core/systemd/systemd_%.bbappend | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend index a40f618733..47ab58d35a 100644 --- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend @@ -3,12 +3,26 @@ 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_mihawk = " file://journald-storage-policy.conf" +SRC_URI_append_mihawk = " file://systemd-journald-override.conf" +SRC_URI_append_mihawk = " file://journald-size-policy.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" FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" +FILES_${PN}_append_mihawk = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" +FILES_${PN}_append_mihawk = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" +FILES_${PN}_append_mihawk = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" + 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 } + +do_install_append_mihawk() { + 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 +} From 4dde41f54f870a2d6415c6024ee852bdece868fe Mon Sep 17 00:00:00 2001 From: steve Date: Mon, 28 Aug 2023 17:22:23 +0800 Subject: [PATCH 2/2] Enable journal persistence for Mowgli --- .../recipes-core/systemd/systemd_%.bbappend | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend index 47ab58d35a..6fb41e9e82 100644 --- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend @@ -7,6 +7,10 @@ SRC_URI_append_mihawk = " file://journald-storage-policy.conf" SRC_URI_append_mihawk = " file://systemd-journald-override.conf" SRC_URI_append_mihawk = " file://journald-size-policy.conf" +SRC_URI_append_mowgli = " file://journald-storage-policy.conf" +SRC_URI_append_mowgli = " file://systemd-journald-override.conf" +SRC_URI_append_mowgli = " file://journald-size-policy.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" FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" @@ -15,6 +19,10 @@ FILES_${PN}_append_mihawk = " ${systemd_unitdir}/journald.conf.d/journald-storag FILES_${PN}_append_mihawk = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" FILES_${PN}_append_mihawk = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" +FILES_${PN}_append_mowgli = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" +FILES_${PN}_append_mowgli = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" +FILES_${PN}_append_mowgli = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" + 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 @@ -26,3 +34,9 @@ do_install_append_mihawk() { 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 } + +do_install_append_mowgli() { + 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 +}