From f0c0ed9f6c0704eeb67de2e47f0c4ddebefd43ec Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 7 Jan 2014 18:30:39 +0100 Subject: [PATCH] systemd: disable journald completely * mask journald.service and socket in postinst * change syslog.socket to observe /dev/log * bump PRINC to 17 --- ...istenDatagram-from-run-systemd-journ.patch | 28 +++++++++++++++++++ recipes-fixes/systemd/systemd_sysmocom.inc | 10 +++++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 recipes-fixes/systemd/systemd/0001-Feature-switch-ListenDatagram-from-run-systemd-journ.patch diff --git a/recipes-fixes/systemd/systemd/0001-Feature-switch-ListenDatagram-from-run-systemd-journ.patch b/recipes-fixes/systemd/systemd/0001-Feature-switch-ListenDatagram-from-run-systemd-journ.patch new file mode 100644 index 0000000..d5c2f53 --- /dev/null +++ b/recipes-fixes/systemd/systemd/0001-Feature-switch-ListenDatagram-from-run-systemd-journ.patch @@ -0,0 +1,28 @@ +From 3b23969111d548addd80710defc65b0430e697b1 Mon Sep 17 00:00:00 2001 +From: Henning Heinold +Date: Tue, 7 Jan 2014 18:26:47 +0100 +Subject: [PATCH] [Feature]: switch ListenDatagram from + run/systemd/journal/syslog to /dev/log + +--- + units/syslog.socket | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/units/syslog.socket b/units/syslog.socket +index e6e9cf8..d233380 100644 +--- a/units/syslog.socket ++++ b/units/syslog.socket +@@ -16,7 +16,9 @@ Before=sockets.target shutdown.target + Conflicts=shutdown.target + + [Socket] +-ListenDatagram=/run/systemd/journal/syslog ++# sysmocom: we disabled journald completely, but we need one socket-service to listen on /dev/log for ++# automatic restart of the busybox-syslogd in error case ++ListenDatagram=/dev/log + SocketMode=0666 + PassCredentials=yes + PassSecurity=yes +-- +1.7.10.4 + diff --git a/recipes-fixes/systemd/systemd_sysmocom.inc b/recipes-fixes/systemd/systemd_sysmocom.inc index a179f8d..484d275 100644 --- a/recipes-fixes/systemd/systemd_sysmocom.inc +++ b/recipes-fixes/systemd/systemd_sysmocom.inc @@ -1,9 +1,11 @@ S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:" -PRINC="16" +PRINC="17" -SRC_URI += "file://journald.conf" +SRC_URI += "file://journald.conf \ + file://0001-Feature-switch-ListenDatagram-from-run-systemd-journ.patch \ + " SRC_URI_append_sysmobts-v1 = " file://system.conf" SRC_URI_append_sysmobts-v2 = " file://system.conf" @@ -33,6 +35,10 @@ pkg_postinst_${PN}_append () { echo -n "$i: " ; systemctl ${OPTS} mask $i.service fi 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 } do_install_append() {