[main] Ensure second deactivate blocks until deactivation

When it comes to deactivation where the various steps of boot
have to be carefully synchronized, we need to make sure that
the client doesn't return early.

diff --git a/src/main.c b/src/main.c
index f914a371aac55f6295c2d88c8801b4fbfdb590c9..a4b6eba30c03a5520cd6e43bad41c590b57a6d8a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -760,7 +760,10 @@ on_deactivate (state_t       *state,
 {
   if (state->deactivate_trigger != NULL)
     {
-      ply_trigger_pull (deactivate_trigger, NULL);
+      ply_trigger_add_handler (state->deactivate_trigger,
+                               (ply_trigger_handler_t)
+                               ply_trigger_pull,
+                               deactivate_trigger);
       return;
     }