From fb19bb237181ac16b4c3e01fe44225c24832c0ce Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Sun, 21 Mar 2010 22:59:09 -0400
Subject: [PATCH] [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.
---
 src/main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main.c b/src/main.c
index f914a371..a4b6eba3 100644
--- 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;
     }