commit 59a56d6fef5885f6d22f1e20bd189d91d5844827 Author: Gao,Yan Date: Mon Sep 30 21:10:44 2013 +0800 Fix: lrmd: Correctly cancel monitor actions for lsb/systemd/service resources on cleaning up (cherry picked from commit 1c14b9d69470ff56fd814091867394cd0a1cf61d) diff --git a/lrmd/lrmd.c b/lrmd/lrmd.c index 8592b6c..65421d0 100644 --- a/lrmd/lrmd.c +++ b/lrmd/lrmd.c @@ -978,7 +978,7 @@ free_rsc(gpointer data) * let service library cancel it and tell us via the callback * when it is cancelled. The rsc can be safely destroyed * even if we are waiting for the cancel result */ - services_action_cancel(rsc->rsc_id, cmd->action, cmd->interval); + services_action_cancel(rsc->rsc_id, normalize_action_name(rsc, cmd->action), cmd->interval); } } /* frees list, but not list elements. */