mirror of
https://github.com/troglobit/finit.git
synced 2026-11-06 15:51:03 +00:00
Reorder, call conf_init() *after* all cond_init()
This to ensure that services, and conditions they may create, actually are recorded in the condition subsystem. Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
1 parent
d068684154
commit
ff41868b59
1 file changed
+5
-5
+5
-5
@@ -438,11 +438,6 @@ int main(int argc, char *argv[])
|
|||||||
/* Check and mount filesystems. */
|
/* Check and mount filesystems. */
|
||||||
fs_mount();
|
fs_mount();
|
||||||
|
|
||||||
/*
|
|
||||||
* Initialize .conf system and load static /etc/finit.conf.
|
|
||||||
*/
|
|
||||||
conf_init();
|
|
||||||
|
|
||||||
/* Bootstrap conditions, needed for hooks */
|
/* Bootstrap conditions, needed for hooks */
|
||||||
cond_init();
|
cond_init();
|
||||||
|
|
||||||
@@ -451,6 +446,11 @@ int main(int argc, char *argv[])
|
|||||||
cond_set_oneshot(plugin_hook_str(HOOK_BANNER));
|
cond_set_oneshot(plugin_hook_str(HOOK_BANNER));
|
||||||
cond_set_oneshot(plugin_hook_str(HOOK_ROOTFS_UP));
|
cond_set_oneshot(plugin_hook_str(HOOK_ROOTFS_UP));
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Initialize .conf system and load static /etc/finit.conf.
|
||||||
|
*/
|
||||||
|
conf_init();
|
||||||
|
|
||||||
/* Base FS up, enable standard SysV init signals */
|
/* Base FS up, enable standard SysV init signals */
|
||||||
sig_setup(&loop);
|
sig_setup(&loop);
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user