From fdde8df474b9ca43ac4bcde164d1dd989cda9d51 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 4 Oct 2019 14:47:52 -0500 Subject: rainier: systemd and journal defaults Use the defaults from witherspoon for now. With more space available in the rainier rootfs, we may tweak these in the future. (From meta-ibm rev: 6e733b66f460ffc03d27c81139ed318bc8c8583e) Change-Id: I66691a06854ab44173fa519e5f95fedbcdb2b6fa Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- .../recipes-core/systemd/systemd_%.bbappend | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend index a40f61873..500c91df5 100644 --- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend @@ -3,12 +3,25 @@ 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_rainier = " file://journald-storage-policy.conf" +SRC_URI_append_rainier = " file://systemd-journald-override.conf" +SRC_URI_append_rainier = " 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_rainier = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" +FILES_${PN}_append_rainier = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" +FILES_${PN}_append_rainier = " ${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_rainier() { + 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 +} -- cgit v1.2.3