From 592c6d7295a24cd49bbf49fcbc089d261bc286af Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sun, 15 Feb 2015 14:35:53 +0100 Subject: [PATCH] systemd: Do not disable the journald on the IDU The IDU is powerful enough to run the journald. This gives us some convenienance to have additional output from our services and we can query them at a later point in time. This will only be useful for systems that are re-installed from scratch. Fixes: SYS#892 --- recipes-fixes/systemd/systemd_sysmocom.inc | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/recipes-fixes/systemd/systemd_sysmocom.inc b/recipes-fixes/systemd/systemd_sysmocom.inc index 43adddb..4554b69 100644 --- a/recipes-fixes/systemd/systemd_sysmocom.inc +++ b/recipes-fixes/systemd/systemd_sysmocom.inc @@ -11,7 +11,10 @@ SRC_URI += "file://journald.conf \ SRC_URI_append_sysmobts-v1 = " file://system.conf" SRC_URI_append_sysmobts-v2 = " file://system.conf" SRC_URI_append_sysmocom-odu = " file://system.conf" + +# We want the journal on the ODU... SRC_URI_append_sysmocom-idu = " file://system.conf" +SRC_URI_remove_sysmocom-idu = " file://0001-Feature-switch-ListenDatagram-from-run-systemd-journ.patch " # Disable depedency on dbus RDEPENDS_${PN}_remove = "dbus" @@ -22,6 +25,15 @@ SYSTEMD_DISABLED_NATIVE_SERVICES = " \ systemd-logind \ " +# disable journald as it isn't efficient +SYSMOCOM_DISABLED_JOURNALD_SERVICES = " \ + systemd-journald.socket \ + systemd-journald.service \ + systemd-journal-flush.service \ +" + +SYSMOCOM_DISABLED_JOURNALD_SERVICES_sysmocom-idu = "" + pkg_postinst_${PN}_append () { cd $D${sysconfdir}/init.d @@ -40,9 +52,10 @@ pkg_postinst_${PN}_append () { done ; echo # disable journald because its using to much cpu under stress logging - systemctl ${OPTS} mask systemd-journald.socket - systemctl ${OPTS} mask systemd-journald.service - systemctl ${OPTS} mask systemd-journal-flush.service + for i in ${SYSMOCOM_DISABLED_JOURNALD_SERVICES} ; do + systemctl ${OPTS} mask $i.service + done + } do_install_append() {