From ac07d3bac7ed80914d62ecdd290957375e97abe9 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sun, 18 Apr 2021 06:17:40 +0200 Subject: [PATCH] contrib: run klogd in same cgroup as syslogd (same .conf file) These two BusyBox daemon's run in concert so it makes sense they also share the same cgroup. In Finit that means sharing the same .conf file. Signed-off-by: Joachim Wiberg --- contrib/alpine/finit.d/available/Makefile.am | 3 +-- contrib/alpine/finit.d/available/klogd.conf | 2 -- contrib/alpine/finit.d/available/syslog.conf | 4 +++- contrib/void/finit.d/available/Makefile.am | 2 +- contrib/void/finit.d/available/klogd.conf | 2 -- contrib/void/finit.d/available/syslogd.conf | 4 +++- 6 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 contrib/alpine/finit.d/available/klogd.conf delete mode 100644 contrib/void/finit.d/available/klogd.conf diff --git a/contrib/alpine/finit.d/available/Makefile.am b/contrib/alpine/finit.d/available/Makefile.am index 4ec27e04..9286bc2f 100644 --- a/contrib/alpine/finit.d/available/Makefile.am +++ b/contrib/alpine/finit.d/available/Makefile.am @@ -1,5 +1,4 @@ docsdir := @docdir@/contrib/alpine/finit.d/available docs_DATA = acpid.conf crond.conf dropbear.conf getty.conf keymap.conf \ - lxdm.conf modules.conf ntpd.conf klogd.conf syslog.conf \ - watchdog.conf + lxdm.conf modules.conf ntpd.conf syslog.conf watchdog.conf EXTRA_DIST = $(docs_DATA) diff --git a/contrib/alpine/finit.d/available/klogd.conf b/contrib/alpine/finit.d/available/klogd.conf deleted file mode 100644 index ad02d302..00000000 --- a/contrib/alpine/finit.d/available/klogd.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Start klogd as soon as possible, after syslogd, should always run -service [S12345] env:-/etc/conf.d/klogd klogd -n $KLOGD_OPTS -- Kernel log daemon diff --git a/contrib/alpine/finit.d/available/syslog.conf b/contrib/alpine/finit.d/available/syslog.conf index c2916ce4..8d24f896 100644 --- a/contrib/alpine/finit.d/available/syslog.conf +++ b/contrib/alpine/finit.d/available/syslog.conf @@ -1,2 +1,4 @@ # Start syslogd as soon as possible, should always run -service [S12345] env:-/etc/conf.d/syslog syslogd -n $SYSLOGD_OPTS -- Syslog daemon +# Start klogd as soon as possible, but after syslogd +service [S12345] env:-/etc/conf.d/syslog syslogd -n $SYSLOGD_OPTS -- Syslog daemon +service [S12345] env:-/etc/conf.d/klogd klogd -n $KLOGD_OPTS -- Kernel log daemon diff --git a/contrib/void/finit.d/available/Makefile.am b/contrib/void/finit.d/available/Makefile.am index 476ee1ca..76601590 100644 --- a/contrib/void/finit.d/available/Makefile.am +++ b/contrib/void/finit.d/available/Makefile.am @@ -1,5 +1,5 @@ docsdir := @docdir@/contrib/void/finit.d/available docs_DATA = acpid.conf crond.conf dhcpcd.conf dmeventd.conf getty.conf \ - keymap.conf klogd.conf lxdm.conf modules.conf ntpd.conf \ + keymap.conf lxdm.conf modules.conf ntpd.conf \ sshd.conf syslogd.conf uuidd.conf EXTRA_DIST = $(docs_DATA) diff --git a/contrib/void/finit.d/available/klogd.conf b/contrib/void/finit.d/available/klogd.conf deleted file mode 100644 index 9e91c452..00000000 --- a/contrib/void/finit.d/available/klogd.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Start klogd as soon as possible, should always run -service [S12345] klogd -n -- Kernel log daemon diff --git a/contrib/void/finit.d/available/syslogd.conf b/contrib/void/finit.d/available/syslogd.conf index 95fc2e39..eb45f125 100644 --- a/contrib/void/finit.d/available/syslogd.conf +++ b/contrib/void/finit.d/available/syslogd.conf @@ -1,2 +1,4 @@ # Start syslogd as soon as possible, should always run -service [S12345] syslogd -n -- Syslog daemon +# Start klogd as soon as possible, but after syslogd +service [S12345] syslogd -n -- Syslog daemon +service [S12345] klogd -n -- Kernel log daemon