Follow-up to b0663d0, cond_init() must run before first hooks

The new condition triggered hooks requrie /var/run/finit/cond to
be set up before calling the first user-configurable hooks.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson committed 2017-12-23 11:19:35 +01:00
1 parent 360f3e72bc
commit 0e37bb0924
1 file changed
+3 -3
+3 -3
View File
@@ -474,6 +474,9 @@ int main(int argc, char* argv[])
if (fexist("/lib/udev/udev-finish")) if (fexist("/lib/udev/udev-finish"))
run_interactive("/lib/udev/udev-finish", "Finalizing udev"); run_interactive("/lib/udev/udev-finish", "Finalizing udev");
/* Bootstrap conditions, needed for hooks */
cond_init();
_d("Root FS up, calling hooks ..."); _d("Root FS up, calling hooks ...");
plugin_run_hooks(HOOK_ROOTFS_UP); plugin_run_hooks(HOOK_ROOTFS_UP);
@@ -487,9 +490,6 @@ int main(int argc, char* argv[])
/* Base FS up, enable standard SysV init signals */ /* Base FS up, enable standard SysV init signals */
sig_setup(&loop); sig_setup(&loop);
/* Bootstrap conditions */
cond_init();
/* /*
* Set up inotify watcher for /etc/finit.d and read all .conf * Set up inotify watcher for /etc/finit.d and read all .conf
* files to figure out how to bootstrap the system. * files to figure out how to bootstrap the system.