Merge branch 'hheinold/journald-removed'
This commit is contained in:
commit
456dacd6be
|
@ -0,0 +1,28 @@
|
|||
From 3b23969111d548addd80710defc65b0430e697b1 Mon Sep 17 00:00:00 2001
|
||||
From: Henning Heinold <henning@itconsulting-heinold.de>
|
||||
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
|
||||
|
|
@ -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() {
|
||||
|
|
Loading…
Reference in New Issue