From da2dde879e096bbd3c06d548cc232ebb96eb5c9b Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 25 Feb 2021 17:54:22 +0100 Subject: [PATCH] contrib: debian: update to use env: files for service arguments Signed-off-by: Joachim Wiberg --- contrib/debian/finit.d/available/Makefile.am | 2 +- contrib/debian/finit.d/available/acpid.conf | 2 +- contrib/debian/finit.d/available/modules.conf | 12 ++++++------ contrib/debian/finit.d/available/ntpclient.conf | 2 -- contrib/debian/finit.d/available/rsyslogd.conf | 2 +- contrib/debian/finit.d/available/sntpd.conf | 2 ++ contrib/debian/finit.d/available/sshd.conf | 2 +- contrib/debian/finit.d/available/syslogd.conf | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 contrib/debian/finit.d/available/ntpclient.conf create mode 100644 contrib/debian/finit.d/available/sntpd.conf diff --git a/contrib/debian/finit.d/available/Makefile.am b/contrib/debian/finit.d/available/Makefile.am index e971a708..bb8e5299 100644 --- a/contrib/debian/finit.d/available/Makefile.am +++ b/contrib/debian/finit.d/available/Makefile.am @@ -1,5 +1,5 @@ docsdir := @docdir@/contrib/debian/finit.d/available docs_DATA = acpid.conf console-setup.conf getty.conf keyboard-setup.conf \ - lightdm.conf modules.conf ntpclient.conf rsyslogd.conf \ + lightdm.conf modules.conf rsyslogd.conf sntpd.conf \ sshd.conf syslogd.conf xdm.conf EXTRA_DIST = $(docs_DATA) diff --git a/contrib/debian/finit.d/available/acpid.conf b/contrib/debian/finit.d/available/acpid.conf index a854b71f..8a255dac 100644 --- a/contrib/debian/finit.d/available/acpid.conf +++ b/contrib/debian/finit.d/available/acpid.conf @@ -1,3 +1,3 @@ # Handle PWR button to shutdown/reboot -- useful in Qemu (virt-manager) # Depends on rsyslogd having started. Redirect any output to log. -service [2345] log acpid -f -- ACPI daemon +service [2345] env:-/etc/default/acpid log acpid -f $OPTIONS -- ACPI daemon diff --git a/contrib/debian/finit.d/available/modules.conf b/contrib/debian/finit.d/available/modules.conf index f5ac914a..f45caec2 100644 --- a/contrib/debian/finit.d/available/modules.conf +++ b/contrib/debian/finit.d/available/modules.conf @@ -1,8 +1,8 @@ ## Linux kernel modules to load #module fbcon -module button -module evdev -module loop -module psmouse -module mousedev -module 8139cp +#module button +#module evdev +#module loop +#module psmouse +#module mousedev +#module 8139cp diff --git a/contrib/debian/finit.d/available/ntpclient.conf b/contrib/debian/finit.d/available/ntpclient.conf deleted file mode 100644 index ed058a67..00000000 --- a/contrib/debian/finit.d/available/ntpclient.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Simple NTP client (SNTP) -service [2345] ntpclient -n -L pool.ntp.org -- SNTP client diff --git a/contrib/debian/finit.d/available/rsyslogd.conf b/contrib/debian/finit.d/available/rsyslogd.conf index f58beaed..5ca6e9f8 100644 --- a/contrib/debian/finit.d/available/rsyslogd.conf +++ b/contrib/debian/finit.d/available/rsyslogd.conf @@ -1,2 +1,2 @@ # Start rsyslogd as soon as possible, should always run -service [S12345] rsyslogd -n -- Reliable and extended syslog daemon +service [S12345] env:-/etc/default/rsyslog rsyslogd -n $RSYSLOGD_OPTIONS -- Reliable syslog daemon diff --git a/contrib/debian/finit.d/available/sntpd.conf b/contrib/debian/finit.d/available/sntpd.conf new file mode 100644 index 00000000..7b5a9fa7 --- /dev/null +++ b/contrib/debian/finit.d/available/sntpd.conf @@ -0,0 +1,2 @@ +# Simple NTP client (SNTP) +service [2345] env:-/etc/default/sntpd sntpd -n $SNTPD_OPTIONS -- SNTP client diff --git a/contrib/debian/finit.d/available/sshd.conf b/contrib/debian/finit.d/available/sshd.conf index 0bc6a63f..62c310ab 100644 --- a/contrib/debian/finit.d/available/sshd.conf +++ b/contrib/debian/finit.d/available/sshd.conf @@ -1,2 +1,2 @@ # Start SSH daemon as soon as basic networking comes up -service [2345] /usr/sbin/sshd -D -- OpenSSH daemon +service [2345] env:-/etc/default/ssh /usr/sbin/sshd -D $SSHD_OPTS -- OpenSSH daemon diff --git a/contrib/debian/finit.d/available/syslogd.conf b/contrib/debian/finit.d/available/syslogd.conf index e2feb808..6896ed10 100644 --- a/contrib/debian/finit.d/available/syslogd.conf +++ b/contrib/debian/finit.d/available/syslogd.conf @@ -1,2 +1,2 @@ # Start sysklogd as soon as possible, should always run if enabled -service [S123456789] syslogd -sF -r 10M:10 -- System logging daemon +service [S123456789] env:-/etc/default/syslogd syslogd -F $SYSLOGD_OPTIONS -- System logging daemon