From ea9f88b9fbea524de34e6a8e2d76297d5fddaeb7 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 25 Feb 2021 18:15:05 +0100 Subject: [PATCH] contrib: alpine: update to use env: files for service arguments - Check for env in /etc/conf.d on Alpine - Update all services with their respective env: file - Disable default modules, noew modprobe plugin should handle this - Add watchdog service - Rename syslogd -> syslog, in case we want to integrate sysklogd Signed-off-by: Joachim Wiberg --- contrib/alpine/build.sh | 12 ++++++------ contrib/alpine/finit.d/available/Makefile.am | 5 +++-- contrib/alpine/finit.d/available/crond.conf | 2 +- contrib/alpine/finit.d/available/dropbear.conf | 2 +- contrib/alpine/finit.d/available/klogd.conf | 2 +- contrib/alpine/finit.d/available/modules.conf | 8 ++++---- contrib/alpine/finit.d/available/ntpd.conf | 4 ++-- contrib/alpine/finit.d/available/syslog.conf | 2 ++ contrib/alpine/finit.d/available/syslogd.conf | 2 -- contrib/alpine/finit.d/available/watchdog.conf | 1 + 10 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 contrib/alpine/finit.d/available/syslog.conf delete mode 100644 contrib/alpine/finit.d/available/syslogd.conf create mode 100644 contrib/alpine/finit.d/available/watchdog.conf diff --git a/contrib/alpine/build.sh b/contrib/alpine/build.sh index 744c0699..ea20792c 100755 --- a/contrib/alpine/build.sh +++ b/contrib/alpine/build.sh @@ -14,12 +14,12 @@ fi # The plugins are optional, but you may need D-Bus and X11 if you want # to run X-Window, the other configure flags are however required. PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/local/lib/pkgconfig ./configure \ - --prefix=/usr --exec-prefix= \ - --sysconfdir=/etc --localstatedir=/var \ - --enable-dbus-plugin --enable-x11-common-plugin \ - --enable-alsa-utils-plugin \ - --enable-watchdog \ - --with-heading="Alpine Linux 3.13" --with-hostname=alpine + --prefix=/usr --exec-prefix= \ + --sysconfdir=/etc --localstatedir=/var \ + --enable-dbus-plugin --enable-x11-common-plugin \ + --enable-alsa-utils-plugin --enable-watchdog \ + --with-sysconfig=/etc/conf.d --with-hostname=alpine \ + --with-heading="Alpine Linux 3.13" echo echo "*** Building ..." diff --git a/contrib/alpine/finit.d/available/Makefile.am b/contrib/alpine/finit.d/available/Makefile.am index f712b81c..4ec27e04 100644 --- a/contrib/alpine/finit.d/available/Makefile.am +++ b/contrib/alpine/finit.d/available/Makefile.am @@ -1,4 +1,5 @@ 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 syslogd.conf +docs_DATA = acpid.conf crond.conf dropbear.conf getty.conf keymap.conf \ + lxdm.conf modules.conf ntpd.conf klogd.conf syslog.conf \ + watchdog.conf EXTRA_DIST = $(docs_DATA) diff --git a/contrib/alpine/finit.d/available/crond.conf b/contrib/alpine/finit.d/available/crond.conf index 1ee0538a..687dc403 100644 --- a/contrib/alpine/finit.d/available/crond.conf +++ b/contrib/alpine/finit.d/available/crond.conf @@ -1 +1 @@ -service [2345] crond -f -S -c /etc/crontabs -- Cron daemon +service [2345] env:-/etc/conf.d/crond crond -f -S $CRON_OPTS -- Cron daemon diff --git a/contrib/alpine/finit.d/available/dropbear.conf b/contrib/alpine/finit.d/available/dropbear.conf index e8cd1212..11db0b73 100644 --- a/contrib/alpine/finit.d/available/dropbear.conf +++ b/contrib/alpine/finit.d/available/dropbear.conf @@ -1,2 +1,2 @@ # Start SSH daemon as soon as basic networking comes up -service [2345] dropbear -R -F -- Dropbear SSH daemon +service [2345] env:-/etc/conf.d/dropbear dropbear -R -F $DROPBEAR_OPTS -- Dropbear SSH daemon diff --git a/contrib/alpine/finit.d/available/klogd.conf b/contrib/alpine/finit.d/available/klogd.conf index 232f45c5..ad02d302 100644 --- a/contrib/alpine/finit.d/available/klogd.conf +++ b/contrib/alpine/finit.d/available/klogd.conf @@ -1,2 +1,2 @@ # Start klogd as soon as possible, after syslogd, should always run -service [S12345] klogd -n -- Kernel log daemon +service [S12345] env:-/etc/conf.d/klogd klogd -n $KLOGD_OPTS -- Kernel log daemon diff --git a/contrib/alpine/finit.d/available/modules.conf b/contrib/alpine/finit.d/available/modules.conf index 1f1ec5b3..7f3d85f0 100644 --- a/contrib/alpine/finit.d/available/modules.conf +++ b/contrib/alpine/finit.d/available/modules.conf @@ -1,6 +1,6 @@ ## Linux kernel modules to load #module fbcon -module button -module evdev -module mousedev -module 8139cp +#module button +#module evdev +#module mousedev +#module 8139cp diff --git a/contrib/alpine/finit.d/available/ntpd.conf b/contrib/alpine/finit.d/available/ntpd.conf index 1968b000..bf8f2d20 100644 --- a/contrib/alpine/finit.d/available/ntpd.conf +++ b/contrib/alpine/finit.d/available/ntpd.conf @@ -1,2 +1,2 @@ -# Silly Busybox ntpd has no option to use syslog when running in foreground -service [2345] log ntpd -n -N -p pool.ntp.org -- NTP daemon +# Busybox ntpd has no option to use syslog when running in foreground +service [2345] log env:-/etc/conf.d/ntpd ntpd -n $NTPD_OPTS -- NTP daemon diff --git a/contrib/alpine/finit.d/available/syslog.conf b/contrib/alpine/finit.d/available/syslog.conf new file mode 100644 index 00000000..c2916ce4 --- /dev/null +++ b/contrib/alpine/finit.d/available/syslog.conf @@ -0,0 +1,2 @@ +# Start syslogd as soon as possible, should always run +service [S12345] env:-/etc/conf.d/syslog syslogd -n $SYSLOGD_OPTS -- Syslog daemon diff --git a/contrib/alpine/finit.d/available/syslogd.conf b/contrib/alpine/finit.d/available/syslogd.conf deleted file mode 100644 index 95fc2e39..00000000 --- a/contrib/alpine/finit.d/available/syslogd.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Start syslogd as soon as possible, should always run -service [S12345] syslogd -n -- Syslog daemon diff --git a/contrib/alpine/finit.d/available/watchdog.conf b/contrib/alpine/finit.d/available/watchdog.conf new file mode 100644 index 00000000..269b711f --- /dev/null +++ b/contrib/alpine/finit.d/available/watchdog.conf @@ -0,0 +1 @@ +service [S123456789] env:-/etc/conf.d/watchdog watchdog $WATCHDOG_OPTS $WATCHDOG_DEV -- System watchdog