New file format

.github/workflows/build.yml

@@ -34,8 +34,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get -y update
-          sudo apt-get -y install pkg-config tree jq libcap-dev
-          sudo apt-get -y install pkg-config
+          sudo apt-get -y install pkg-config tree jq libcap-dev libconfuse-dev
           wget https://github.com/troglobit/libuev/releases/download/v2.4.1/libuev-2.4.1.tar.xz
           wget https://github.com/troglobit/libite/releases/download/v2.6.2/libite-2.6.2.tar.gz
           tar xf libuev-2.4.1.tar.xz

.github/workflows/coverity.yml

@@ -55,7 +55,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get -y update
-          sudo apt-get -y install pkg-config libcap-dev
+          sudo apt-get -y install pkg-config libcap-dev libconfuse-dev
           wget https://github.com/troglobit/libuev/releases/download/v2.4.1/libuev-2.4.1.tar.xz
           wget https://github.com/troglobit/libite/releases/download/v2.6.2/libite-2.6.2.tar.gz
           tar xf libuev-2.4.1.tar.xz

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Installing dependencies ...
         run: |
           sudo apt-get -y update
-          sudo apt-get -y install pkg-config jq libcap-dev
+          sudo apt-get -y install pkg-config jq libcap-dev libconfuse-dev
           wget https://github.com/troglobit/libuev/releases/download/v2.4.1/libuev-2.4.1.tar.xz
           wget https://github.com/troglobit/libite/releases/download/v2.6.2/libite-2.6.2.tar.gz
           tar xf libuev-2.4.1.tar.xz

.github/workflows/weekly.yml

@@ -34,7 +34,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get -y update
-          sudo apt-get -y install pkg-config jq libcap-dev
+          sudo apt-get -y install pkg-config jq libcap-dev libconfuse-dev
           wget https://github.com/troglobit/libuev/releases/download/v2.4.1/libuev-2.4.1.tar.xz
           wget https://github.com/troglobit/libite/releases/download/v2.6.2/libite-2.6.2.tar.gz
           tar xf libuev-2.4.1.tar.xz

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([Finit], [4.17], [https://github.com/finit-project/finit/issues],
+AC_INIT([Finit], [5.0-dev], [https://github.com/finit-project/finit/issues],
 	[finit], [https://http://finit-project.github.io/])
 AC_CONFIG_AUX_DIR(aux)
 AM_INIT_AUTOMAKE([1.11 foreign subdir-objects])
@@ -50,6 +50,12 @@ PKG_PROG_PKG_CONFIG
 # Check for required libraries
 PKG_CHECK_MODULES([uev],  [libuev >= 2.4.1])
 PKG_CHECK_MODULES([lite], [libite >= 2.6.1])
+# 3.3 is the floor: CFGF_KEYSTRVAL, which environment {} and the
+# free-form cgroup keys are built on, does not exist before it.  3.3
+# parses both correctly.  Two workarounds hang off this number, the
+# spurious KEYSTRVAL warning and cfg_parse_buf() losing the file name
+# of a template; grep the XXX notes in src/conf.c before raising it.
+PKG_CHECK_MODULES([confuse], [libconfuse >= 3.3])
 
 # Check for configured Finit features
 AC_ARG_ENABLE(auto_reload,

contrib/alpine/finit.conf

@@ -3,24 +3,34 @@
 
 ## Runlevel to start after bootstrap, runlevel 'S'
 # Default is 2
-#runlevel 2
+#runlevel = 2
 
 # Top-level cgroups and their default settings.  All groups mandatory
 # but more can be added, max 8 groups in total currently.  The cgroup
 # 'root' is also available, reserved for RT processes.  Settings are
 # as-is, only one shorthand 'mem.' exists, other than that it's the
 # cgroup v2 controller default names.
-#cgroup init   cpu.weight:100
-#cgroup user   cpu.weight:100
-#cgroup system cpu.weight:9700
+#cgroup init   { cpu.weight = 100  }
+#cgroup user   { cpu.weight = 100  }
+#cgroup system { cpu.weight = 9700 }
 
 # Task to run if ctrl-alt-del is pressed.  This condition is asserted by
 # Finit upon receiving SIGINT (from the kernel).
-#task <sys/key/ctrlaltdel> [12345789] initctl reboot -- Rebooting system
+#task reboot {
+#	description = "Rebooting system"
+#	runlevel    = "12345789"
+#	conditions  = { "sys/key/ctrlaltdel" }
+#	command     = "initctl reboot"
+#}
 
 # Task to run if the kernel gets a power fail condition is pressed.
 # Asserted by Finit upon receiving SIGPWR (from the kernel).
-#task <sys/pwr/fail> [12345789] initctl poweroff -- Shutting down system
+#task poweroff {
+#	description = "Shutting down system"
+#	runlevel    = "12345789"
+#	conditions  = { "sys/pwr/fail" }
+#	command     = "initctl poweroff"
+#}
 
 ## Bootstrap services and tasks
 # Can be listed here or in /etc/finit.d/*.conf

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

@@ -1,3 +1,9 @@
 # Handle PWR button to shutdown/reboot -- useful in Qemu (virt-manager)
 # Depends on syslogd having started. Redirect any output to log.
-service [2345] <pid/syslogd> log acpid -f -- ACPI daemon
+service acpid {
+	description = "ACPI daemon"
+	runlevel    = "2345"
+	conditions  = { "pid/syslogd" }
+	log { }
+	command     = "acpid -f"
+}

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

@@ -1 +1,7 @@
-service [2345] <pid/syslogd> env:-/etc/conf.d/crond crond -f -S $CRON_OPTS -- Cron daemon
+service crond {
+	description = "Cron daemon"
+	runlevel    = "2345"
+	conditions  = { "pid/syslogd" }
+	envfile     = "-/etc/conf.d/crond"
+	command     = "crond -f -S $CRON_OPTS"
+}

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

@@ -1,2 +1,7 @@
 # Start SSH daemon as soon as basic networking comes up
-service [2345] env:-/etc/conf.d/dropbear dropbear -R -F $DROPBEAR_OPTS -- Dropbear SSH daemon
+service dropbear {
+	description = "Dropbear SSH daemon"
+	runlevel    = "2345"
+	envfile     = "-/etc/conf.d/dropbear"
+	command     = "dropbear -R -F $DROPBEAR_OPTS"
+}

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

@@ -1,5 +1,24 @@
 # Consoles to start getty on when system is up
-tty [12345] /dev/ttyS0 noclear
-tty [12345] /dev/tty1  noclear nowait
-tty [2345]  /dev/tty2  noclear nowait
-tty [2345]  /dev/tty3  noclear nowait
+tty ttyS0 {
+	runlevel = "12345"
+	device   = "/dev/ttyS0"
+	noclear  = true
+}
+tty tty1 {
+	runlevel = "12345"
+	device   = "/dev/tty1"
+	noclear  = true
+	nowait   = true
+}
+tty tty2 {
+	runlevel = "2345"
+	device   = "/dev/tty2"
+	noclear  = true
+	nowait   = true
+}
+tty tty3 {
+	runlevel = "2345"
+	device   = "/dev/tty3"
+	noclear  = true
+	nowait   = true
+}

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

@@ -1,2 +1,7 @@
 # Oneshot task to run once at bootstrap
-task [S] env:/etc/conf.d/loadkmap zcat $KEYMAP | loadkmap -- Loading keymap
+task keymap {
+	description = "Loading keymap"
+	runlevel    = "S"
+	envfile     = "/etc/conf.d/loadkmap"
+	command     = "zcat $KEYMAP | loadkmap"
+}

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

@@ -1 +1,5 @@
-service [2345] lxdm -- Lightweight Login Manager
+service lxdm {
+	description = "Lightweight Login Manager"
+	runlevel    = "2345"
+	command     = "lxdm"
+}

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

@@ -1,7 +1,2 @@
 ## Linux kernel modules to load
-#module fbcon
-#module button
-#module evdev
-#module mousedev
-#module 8139cp
-#module softdog
+#modules = { "fbcon", "button", "evdev", "mousedev", "8139cp", "softdog" }

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

@@ -1,2 +1,9 @@
 # Busybox ntpd has no option to use syslog when running in foreground
-service [2345] <pid/syslogd> env:-/etc/conf.d/ntpd log ntpd -n $NTPD_OPTS -- NTP daemon
+service ntpd {
+	description = "NTP daemon"
+	runlevel    = "2345"
+	conditions  = { "pid/syslogd" }
+	envfile     = "-/etc/conf.d/ntpd"
+	log { }
+	command     = "ntpd -n $NTPD_OPTS"
+}

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

@@ -1,4 +1,15 @@
 # Start syslogd as soon as possible, should always run
 # Start klogd as soon as possible, but after syslogd
-service [S12345] env:-/etc/conf.d/syslog syslogd -n $SYSLOGD_OPTS          -- Syslog daemon
-service [S12345] <pid/syslogd> env:-/etc/conf.d/klogd klogd -n $KLOGD_OPTS -- Kernel log daemon
+service syslogd {
+	description = "Syslog daemon"
+	runlevel    = "S12345"
+	envfile     = "-/etc/conf.d/syslog"
+	command     = "syslogd -n $SYSLOGD_OPTS"
+}
+service klogd {
+	description = "Kernel log daemon"
+	runlevel    = "S12345"
+	conditions  = { "pid/syslogd" }
+	envfile     = "-/etc/conf.d/klogd"
+	command     = "klogd -n $KLOGD_OPTS"
+}

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

@@ -1 +1,6 @@
-service [S123456789] env:-/etc/conf.d/watchdog watchdog $WATCHDOG_OPTS $WATCHDOG_DEV -- System watchdog
+service watchdog {
+	description = "System watchdog"
+	runlevel    = "S123456789"
+	envfile     = "-/etc/conf.d/watchdog"
+	command     = "watchdog $WATCHDOG_OPTS $WATCHDOG_DEV"
+}

contrib/debian/finit.conf

@@ -3,24 +3,34 @@
 
 ## Runlevel to start after bootstrap, runlevel 'S'
 # Default is 2
-#runlevel 2
+#runlevel = 2
 
 # Top-level cgroups and their default settings.  All groups mandatory
 # but more can be added, max 8 groups in total currently.  The cgroup
 # 'root' is also available, reserved for RT processes.  Settings are
 # as-is, only one shorthand 'mem.' exists, other than that it's the
 # cgroup v2 controller default names.
-#cgroup init   cpu.weight:100
-#cgroup user   cpu.weight:100
-#cgroup system cpu.weight:9700
+#cgroup init   { cpu.weight = 100  }
+#cgroup user   { cpu.weight = 100  }
+#cgroup system { cpu.weight = 9700 }
 
 # Task to run if ctrl-alt-del is pressed.  This condition is asserted by
 # Finit upon receiving SIGINT (from the kernel).
-#task <sys/key/ctrlaltdel> [12345789] initctl reboot -- Rebooting system
+#task reboot {
+#	description = "Rebooting system"
+#	runlevel    = "12345789"
+#	conditions  = { "sys/key/ctrlaltdel" }
+#	command     = "initctl reboot"
+#}
 
 # Task to run if the kernel gets a power fail condition is pressed.
 # Asserted by Finit upon receiving SIGPWR (from the kernel).
-#task <sys/pwr/fail> [12345789] initctl poweroff -- Shutting down system
+#task poweroff {
+#	description = "Shutting down system"
+#	runlevel    = "12345789"
+#	conditions  = { "sys/pwr/fail" }
+#	command     = "initctl poweroff"
+#}
 
 ## Bootstrap services and tasks
 # Can be listed here or in /etc/finit.d/*.conf

contrib/debian/finit.d/available/acpid.conf

@@ -1,3 +1,10 @@
 # Handle PWR button to shutdown/reboot -- useful in Qemu (virt-manager)
 # Depends on a syslog daemon having started. Redirect any output to log.
-service [2345] <pid/syslogd> env:-/etc/default/acpid log acpid -f $OPTIONS -- ACPI daemon
+service acpid {
+	description = "ACPI daemon"
+	runlevel    = "2345"
+	conditions  = { "pid/syslogd" }
+	envfile     = "-/etc/default/acpid"
+	log { }
+	command     = "acpid -f $OPTIONS"
+}

contrib/debian/finit.d/available/anacron.conf

@@ -1 +1,8 @@
-task [2345] <sys/pwr/ac,pid/syslogd> halt:usr1 env:-/etc/default/anacron anacron -d -q $ANACRON_ARGS -- Anacron jobs
+task anacron {
+	description = "Anacron jobs"
+	runlevel    = "2345"
+	conditions  = { "sys/pwr/ac", "pid/syslogd" }
+	envfile     = "-/etc/default/anacron"
+	stop-signal = "usr1"
+	command     = "anacron -d -q $ANACRON_ARGS"
+}

contrib/debian/finit.d/available/apparmor.conf

@@ -1,2 +1,6 @@
-sysv [S] /etc/init.d/apparmor -- AppArmor initialization
+sysv apparmor {
+	description = "AppArmor initialization"
+	runlevel    = "S"
+	command     = "/etc/init.d/apparmor"
+}
 

contrib/debian/finit.d/available/avahi-daemon.conf

@@ -1 +1,6 @@
-service [2345] env:-/etc/default/avahi-daemon avahi-daemon -s $AVAHI_DAEMON_OPTS -- Avahi mDNS/DNS-SD Stack
+service avahi-daemon {
+	description = "Avahi mDNS/DNS-SD Stack"
+	runlevel    = "2345"
+	envfile     = "-/etc/default/avahi-daemon"
+	command     = "avahi-daemon -s $AVAHI_DAEMON_OPTS"
+}

contrib/debian/finit.d/available/bluetooth.conf

@@ -1,3 +1,9 @@
 # To ignore errors like "org.freedesktop.hostname1", update the env file with
 # "--noplugin=hostname", i.e. append to BLUETOOTHD_OPTS
-service [2345] log:null env:-/etc/default/bluetooth /usr/libexec/bluetooth/bluetoothd -n $BLUETOOTHD_OPTS -- Bluetooth service
+service bluetoothd {
+	description = "Bluetooth service"
+	runlevel    = "2345"
+	envfile     = "-/etc/default/bluetooth"
+	log { file = "/dev/null" }
+	command     = "/usr/libexec/bluetooth/bluetoothd -n $BLUETOOTHD_OPTS"
+}

contrib/debian/finit.d/available/console-setup.conf

@@ -1,2 +1,6 @@
 # Oneshot task to run once at bootstrap
-task [S] /lib/console-setup/console-setup.sh -- Setting up console font and keymap
+task console-setup {
+	description = "Setting up console font and keymap"
+	runlevel    = "S"
+	command     = "/lib/console-setup/console-setup.sh"
+}

contrib/debian/finit.d/available/cron.conf

@@ -1 +1,7 @@
-service [2345] <sys/pwr/ac,pid/syslogd> env:-/etc/default/cron cron -f $EXTRA_OPTS -- Background job processing daemon
+service cron {
+	description = "Background job processing daemon"
+	runlevel    = "2345"
+	conditions  = { "sys/pwr/ac", "pid/syslogd" }
+	envfile     = "-/etc/default/cron"
+	command     = "cron -f $EXTRA_OPTS"
+}

contrib/debian/finit.d/available/elogind.conf

@@ -1,4 +1,9 @@
 # On some systems, bootstrap can be really quick and cause elogind
 # to not start before a user has managed to log in.  To prevent
 # this, add <pid/elogind> as condition to your TTYs in getty.conf
-service [2345] <pid/syslogd> /usr/libexec/elogind -- Login manager
+service elogind {
+	description = "Login manager"
+	runlevel    = "2345"
+	conditions  = { "pid/syslogd" }
+	command     = "/usr/libexec/elogind"
+}

contrib/debian/finit.d/available/getty.conf

@@ -1,7 +1,38 @@
 # Consoles to start getty on when system is up
-tty [12345] /dev/tty1 linux noclear nowait
-tty [2345]  /dev/tty2 linux nowait
-tty [2345]  /dev/tty3 linux nowait
-tty [2345]  /dev/tty4 linux nowait
-tty [2345]  /dev/tty5 linux nowait
-tty [2345]  /dev/tty6 linux nowait
+tty tty1 {
+	runlevel = "12345"
+	device   = "/dev/tty1"
+	term     = "linux"
+	noclear  = true
+	nowait   = true
+}
+tty tty2 {
+	runlevel = "2345"
+	device   = "/dev/tty2"
+	term     = "linux"
+	nowait   = true
+}
+tty tty3 {
+	runlevel = "2345"
+	device   = "/dev/tty3"
+	term     = "linux"
+	nowait   = true
+}
+tty tty4 {
+	runlevel = "2345"
+	device   = "/dev/tty4"
+	term     = "linux"
+	nowait   = true
+}
+tty tty5 {
+	runlevel = "2345"
+	device   = "/dev/tty5"
+	term     = "linux"
+	nowait   = true
+}
+tty tty6 {
+	runlevel = "2345"
+	device   = "/dev/tty6"
+	term     = "linux"
+	nowait   = true
+}

contrib/debian/finit.d/available/keyboard-setup.conf

@@ -1,2 +1,6 @@
 # Oneshot task to run once at bootstrap
-task [S] /lib/console-setup/keyboard-setup.sh -- Setting up console keyboard layout
+task keyboard-setup {
+	description = "Setting up console keyboard layout"
+	runlevel    = "S"
+	command     = "/lib/console-setup/keyboard-setup.sh"
+}

contrib/debian/finit.d/available/lightdm.conf

@@ -1 +1,5 @@
-service [3] lightdm -- Light Display Manager
+service lightdm {
+	description = "Light Display Manager"
+	runlevel    = "3"
+	command     = "lightdm"
+}