wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-19 11:09:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: read /run/finit/system before /lib/finit/system

Browse Source 
Stanzas in /lib/finit/system cannot use if:keventd, or any other
built-in service: if: is evaluated at parse time, and the generated
.conf files for built-ins were read after the system directory, so the
referenced service did not exist yet and the stanza was dropped.

The late position was deliberate: it kept bundled services from starting
before udev (5d703fd3).  The motivating case was dbus, which has since
moved to a build-time 20-dbus.conf (2e0b1d6f), and the built-ins that
remain want the early slot: watchdogd should start as soon as possible,
keventd is the device manager, and runparts is gated on int/bootstrap so
its position never mattered.

Reading /run/finit/system first also puts the override chain in its
natural order: built-in/generated defaults, then bundled (read-only)
system files in /lib, then the administrator (override) .conf file in
/etc/finit.d, always read last.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2026-08-17 19:04:52 +02:00
1 parent 1a2cc950f0
commit e8391864d7
3 files changed
+41 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/conf.c
+18 -23
View File
@@ -701,9 +701,9 @@ char *conf_escape(const char *str, char *buf, size_t len)
}
/*
* Called by plugins and similar that dynamically generate system
* services. @body holds the block contents, one indented line per
* setting.
* Generates /run/finit/system/<file> for Finit's built-in services,
* which must probe the running system before registering. @fmt holds
* the block contents, one indented line per setting.
*/
void conf_save_service(int type, const char *name, char *file, const char *fmt, ...)
{
@@ -2307,28 +2307,23 @@ int conf_reload(void)
}
/*
* Next, read all *.conf in /lib/finit/system and /etc/finit.d/
* The system files were previously created at runtime by plugins
* but are now regular files that can be overridden by files in
* /etc/finit.d -- similar to how tmfiles.d(5) work. E.g., add
* an override .conf, or an ignore by symlinking to /dev/null
* Next, read all *.conf in /run/finit/system, /lib/finit/system,
* and /etc/finit.d/. The runtime directory holds files Finit
* generates for its built-in services (keventd, watchdogd,
* runparts), read first so later files can reference them in
* if: statements. A same-named file in a later directory
* overrides an earlier one, similar to how tmpfiles.d(5) work,
* so /etc/finit.d, always read last, is how users override any
* built-in or bundled configuration.
*
* The .conf files (and run/task/service stanzas) are parsed and
* started in order. Each directory is sorted alphanumerically
* and then the result is appended to the overall order:
*
* /lib/finit/system/10-hotplug.conf
* /lib/finit/system/90-testserv.conf
* /run/finit/system/dbus.conf
* /run/finit/system/tty.conf
* /etc/finit.d/10-abc.conf
* /etc/finit.d/20-abc.conf
* /etc/finit.d/enabled/1-aaa.conf
* /etc/finit.d/enabled/1-abc.conf
* /etc/finit.d/enabled/2-aaa.conf
* The .conf files (and their run/task/service stanzas) are
* parsed and started in order. Each directory is sorted
* alphanumerically before being appended to the overall order,
* recorded in /run/finit/conf.order at bootstrap. See
* doc/config/files.md for an example.
*/
glob_append(&gl, 0, "%s/*.conf", FINIT_SYSPATH_);
glob_append(&gl, 1, "%s/*.conf", FINIT_RUNPATH_);
glob_append(&gl, 0, "%s/*.conf", FINIT_RUNPATH_);
glob_append(&gl, 1, "%s/*.conf", FINIT_SYSPATH_);
glob_append(&gl, 1, "%s/*.conf", finit_rcsd);
glob_append(&gl, 1, "%s/enabled/*.conf", finit_rcsd);