wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-11-02 13:20:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix evaluation order of /lib/finit/system/* vs /etc/finit.d/*

Browse Source 
See updated documentation and inline comment for details.

Fix #371

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2023-10-04 17:20:15 +02:00
1 parent 33cee0ba5f
commit 41648a073b
2 files changed
+65 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/conf.c
+14 -2
View File
@@ -1152,9 +1152,21 @@ int conf_reload(void)
* 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
*
* 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
* /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
*/
glob_append(&gl, 0, "%s/*.conf", finit_rcsd);
glob_append(&gl, 1, "%s/*.conf", FINIT_SYSPATH);
glob_append(&gl, 0, "%s/*.conf", FINIT_SYSPATH);
glob_append(&gl, 1, "%s/*.conf", finit_rcsd);
glob_append(&gl, 1, "%s/enabled/*.conf", finit_rcsd);
for (i = 0; i < gl.gl_pathc; i++) {