From d4d42a7a7557358cc485a4ffae5c76c35763dd95 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Tue, 10 Oct 2017 11:59:29 +0200 Subject: [PATCH] Debian GNU/Linux: Convert finit.conf to finit.d/*.conf Signed-off-by: Joachim Nilsson --- contrib/debian/finit.conf | 58 +++---------------- contrib/debian/finit.d/available/acpid.conf | 3 + .../finit.d/available/console-setup.conf | 2 + .../finit.d/available/keyboard-setup.conf | 2 + contrib/debian/finit.d/available/modules.conf | 8 +++ .../debian/finit.d/available/ntpclient.conf | 2 + .../debian/finit.d/available/rsyslogd.conf | 2 + contrib/debian/finit.d/available/sshd.conf | 2 + contrib/debian/finit.d/available/tty.conf | 4 ++ contrib/debian/finit.d/available/xdm.com | 5 ++ contrib/debian/finit.d/console-setup.conf | 1 + contrib/debian/finit.d/keyboard-setup.conf | 1 + contrib/debian/finit.d/modules.conf | 1 + contrib/debian/finit.d/rsyslogd.conf | 1 + contrib/debian/finit.d/sshd.conf | 1 + contrib/debian/finit.d/tty.conf | 1 + 16 files changed, 43 insertions(+), 51 deletions(-) create mode 100644 contrib/debian/finit.d/available/acpid.conf create mode 100644 contrib/debian/finit.d/available/console-setup.conf create mode 100644 contrib/debian/finit.d/available/keyboard-setup.conf create mode 100644 contrib/debian/finit.d/available/modules.conf create mode 100644 contrib/debian/finit.d/available/ntpclient.conf create mode 100644 contrib/debian/finit.d/available/rsyslogd.conf create mode 100644 contrib/debian/finit.d/available/sshd.conf create mode 100644 contrib/debian/finit.d/available/tty.conf create mode 100644 contrib/debian/finit.d/available/xdm.com create mode 120000 contrib/debian/finit.d/console-setup.conf create mode 120000 contrib/debian/finit.d/keyboard-setup.conf create mode 120000 contrib/debian/finit.d/modules.conf create mode 120000 contrib/debian/finit.d/rsyslogd.conf create mode 120000 contrib/debian/finit.d/sshd.conf create mode 120000 contrib/debian/finit.d/tty.conf diff --git a/contrib/debian/finit.conf b/contrib/debian/finit.conf index 2a790e80..13f705a1 100644 --- a/contrib/debian/finit.conf +++ b/contrib/debian/finit.conf @@ -1,54 +1,10 @@ -# /etc/finit.conf: Example for Debian GNU/Linux 8.5 -# Here we use one big (?) finit.conf, but all non-bootstrap services -# can just as easily be listed in a separate /etc/finit.d/*.conf +# /etc/finit.conf: Example for Debian GNU/Linux +# See /etc/finit.d/*.conf and `initctl list` for other services -# The host directive is a fallback if /etc/hostname is missing -host jessie +## Runlevel to start after bootstrap, runlevel 'S' +# Default is 2 +#runlevel 2 -# Linux kernel modules to load, /etc/modprobe is not used -module button -module evdev -module loop -module psmouse +## Bootstrap services and tasks +# Can be listed here or in /etc/finit.d/*.conf -# Runlevel to start after bootstrap, runlevel 'S'. -# Change this to 3 to start XDM at boot. -runlevel 2 - -# Some services may need to start very early, e.g. a watchdog daemon. -# Runlevel [S] (bootStrap) is useful for that. It cannot be switched -# to at runtime either, so tasks and run directives usually live here. -# Please note, the run directive is blocking, so be careful! -#service [S12345] /sbin/watchdogd -n -- Watchdog daemon -#run [S] /sbin/probe -- system probe -#run [S] /sbin/setupd --bootstrap -- system bootstrap -service [S12345] /usr/sbin/rsyslogd -n -- Syslog daemon - -# Network bringup script not needed if /etc/network/interfaces is used -#network service networking start - -# Regular services to be monitored and respawned as needed. Here we use -# a (svc) condition, the listed service must be started (waits for the -# PID file to be created in /run/*.pid) before starting either service, -# (net) conditions are also available. -service [2345] log /usr/sbin/acpid -f -- ACPI daemon -service [2345] /usr/sbin/sshd -D -- SSH daemon - -# Here we use XDM since it has few dependencies (relatively speaking). -# It is also an example of a service without a -- description. -# service [3] /usr/sbin/lightdm -- X-Window Display Manager -service [3] /usr/bin/xdm -nodaemon - -# Run old-style start scripts from this directory. Very similar to how -# SysV init works: 01first, 02second, etc. see run-parsts(8) for details -#runparts /etc/start.d -# |-- S03keyboard-setup -# |-- S17kbd -# `- S18console-setup - -# Virtual consoles to start getty on. Runlevels, speed & $TERM optional -# TTYs are also services, sort of, but they are guaranteed to start at -# the very end of the boot sequence. Finit comes with a built-in getty. -tty [12345] /dev/tty1 115200 vt100 -tty [2345] /dev/tty2 38400 linux -tty [2345] /dev/tty3 38400 linux diff --git a/contrib/debian/finit.d/available/acpid.conf b/contrib/debian/finit.d/available/acpid.conf new file mode 100644 index 00000000..ccfcd8bc --- /dev/null +++ b/contrib/debian/finit.d/available/acpid.conf @@ -0,0 +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 /usr/sbin/acpid -f -- ACPI daemon diff --git a/contrib/debian/finit.d/available/console-setup.conf b/contrib/debian/finit.d/available/console-setup.conf new file mode 100644 index 00000000..d228cf07 --- /dev/null +++ b/contrib/debian/finit.d/available/console-setup.conf @@ -0,0 +1,2 @@ +# Oneshot task to run once at bootstrap +task [S] /lib/console-setup/console-setup.sh -- Set console font and keymap diff --git a/contrib/debian/finit.d/available/keyboard-setup.conf b/contrib/debian/finit.d/available/keyboard-setup.conf new file mode 100644 index 00000000..290564a2 --- /dev/null +++ b/contrib/debian/finit.d/available/keyboard-setup.conf @@ -0,0 +1,2 @@ +# Oneshot task to run once at bootstrap +task [S] /lib/console-setup/keyboard-setup.sh -- Set console keyboard layout diff --git a/contrib/debian/finit.d/available/modules.conf b/contrib/debian/finit.d/available/modules.conf new file mode 100644 index 00000000..f5ac914a --- /dev/null +++ b/contrib/debian/finit.d/available/modules.conf @@ -0,0 +1,8 @@ +## Linux kernel modules to load +#module fbcon +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 new file mode 100644 index 00000000..1d5abe4c --- /dev/null +++ b/contrib/debian/finit.d/available/ntpclient.conf @@ -0,0 +1,2 @@ +# Simple NTP client (SNTP) +service [2345] /usr/sbin/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 new file mode 100644 index 00000000..68e52142 --- /dev/null +++ b/contrib/debian/finit.d/available/rsyslogd.conf @@ -0,0 +1,2 @@ +# Start rsyslogd as soon as possible, should always run +service [S12345] /usr/sbin/rsyslogd -n -- Reliable and extended syslog daemon diff --git a/contrib/debian/finit.d/available/sshd.conf b/contrib/debian/finit.d/available/sshd.conf new file mode 100644 index 00000000..0bc6a63f --- /dev/null +++ b/contrib/debian/finit.d/available/sshd.conf @@ -0,0 +1,2 @@ +# Start SSH daemon as soon as basic networking comes up +service [2345] /usr/sbin/sshd -D -- OpenSSH daemon diff --git a/contrib/debian/finit.d/available/tty.conf b/contrib/debian/finit.d/available/tty.conf new file mode 100644 index 00000000..763b561f --- /dev/null +++ b/contrib/debian/finit.d/available/tty.conf @@ -0,0 +1,4 @@ +# Consoles to start getty on when system is up +tty [12345] /dev/tty1 115200 vt100 noclear nowait +tty [2345] /dev/tty2 38400 linux noclear nowait +tty [2345] /dev/tty3 38400 linux noclear nowait diff --git a/contrib/debian/finit.d/available/xdm.com b/contrib/debian/finit.d/available/xdm.com new file mode 100644 index 00000000..449622c3 --- /dev/null +++ b/contrib/debian/finit.d/available/xdm.com @@ -0,0 +1,5 @@ +# Here we use XDM since it has few dependencies (relatively speaking). +# It is also an example of a service without a -- description. +# service [3] /usr/sbin/lightdm -- X-Window Display Manager +# service [3] /usr/sbin/lxdm -- Lightweight Login Manager +service [3] /usr/bin/xdm -nodaemon diff --git a/contrib/debian/finit.d/console-setup.conf b/contrib/debian/finit.d/console-setup.conf new file mode 120000 index 00000000..44191569 --- /dev/null +++ b/contrib/debian/finit.d/console-setup.conf @@ -0,0 +1 @@ +available/console-setup.conf \ No newline at end of file diff --git a/contrib/debian/finit.d/keyboard-setup.conf b/contrib/debian/finit.d/keyboard-setup.conf new file mode 120000 index 00000000..0c1c6141 --- /dev/null +++ b/contrib/debian/finit.d/keyboard-setup.conf @@ -0,0 +1 @@ +available/keyboard-setup.conf \ No newline at end of file diff --git a/contrib/debian/finit.d/modules.conf b/contrib/debian/finit.d/modules.conf new file mode 120000 index 00000000..edd6cc7b --- /dev/null +++ b/contrib/debian/finit.d/modules.conf @@ -0,0 +1 @@ +available/modules.conf \ No newline at end of file diff --git a/contrib/debian/finit.d/rsyslogd.conf b/contrib/debian/finit.d/rsyslogd.conf new file mode 120000 index 00000000..a61f0b8f --- /dev/null +++ b/contrib/debian/finit.d/rsyslogd.conf @@ -0,0 +1 @@ +available/rsyslogd.conf \ No newline at end of file diff --git a/contrib/debian/finit.d/sshd.conf b/contrib/debian/finit.d/sshd.conf new file mode 120000 index 00000000..724a9614 --- /dev/null +++ b/contrib/debian/finit.d/sshd.conf @@ -0,0 +1 @@ +available/sshd.conf \ No newline at end of file diff --git a/contrib/debian/finit.d/tty.conf b/contrib/debian/finit.d/tty.conf new file mode 120000 index 00000000..20b69f93 --- /dev/null +++ b/contrib/debian/finit.d/tty.conf @@ -0,0 +1 @@ +available/tty.conf \ No newline at end of file