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 <troglobit@gmail.com>

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 ..."

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)

contrib/alpine/finit.d/available/crond.conf

@@ -1 +1 @@
-service [2345] <pid/syslogd> crond -f -S -c /etc/crontabs -- Cron daemon
+service [2345] <pid/syslogd> env:-/etc/conf.d/crond crond -f -S $CRON_OPTS -- Cron daemon

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

contrib/alpine/finit.d/available/klogd.conf

@@ -1,2 +1,2 @@
 # Start klogd as soon as possible, after syslogd, should always run
-service [S12345] <pid/syslogd> klogd -n -- Kernel log daemon
+service [S12345] <pid/syslogd> env:-/etc/conf.d/klogd klogd -n $KLOGD_OPTS -- Kernel log daemon

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

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 <pid/syslogd> ntpd -n -N -p pool.ntp.org -- NTP daemon
+# Busybox ntpd has no option to use syslog when running in foreground
+service [2345] log <pid/syslogd> env:-/etc/conf.d/ntpd ntpd -n $NTPD_OPTS -- NTP daemon

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

contrib/alpine/finit.d/available/syslogd.conf

@@ -1,2 +0,0 @@
-# Start syslogd as soon as possible, should always run
-service [S12345] syslogd -n -- Syslog daemon

contrib/alpine/finit.d/available/watchdog.conf

@@ -0,0 +1 @@
+service [S123456789] env:-/etc/conf.d/watchdog watchdog $WATCHDOG_OPTS $WATCHDOG_DEV -- System watchdog