From 308b7c5197eb49916d7635f90bed0ab4965ac509 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 9 Jan 2023 08:09:22 +0100 Subject: [PATCH] Follow-up to #338: return early if conditions are not available As pointed out by Jack Newman in issue #338, when conditions are not available (at boot before cond_init(), or shutdown when /var or /var/run have been unmounted) we should not try to create any conditions. Signed-off-by: Joachim Wiberg --- src/plugin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugin.c b/src/plugin.c index 370ccd69..a4b3e2ab 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -261,7 +261,7 @@ void plugin_run_hook(hook_point_t no, void *arg) /* Conditions are stored in /run, so don't try to signal * conditions for any hooks before filesystems have been * mounted. */ - if (no >= HOOK_MOUNT_ERROR && no <= HOOK_SHUTDOWN) + if (cond_is_available() && no >= HOOK_MOUNT_ERROR && no <= HOOK_SHUTDOWN) cond_set_oneshot(hook_cond[no]); service_step_all(SVC_TYPE_RUNTASK);