From: Vincent Bernat <bernat@luffy.cx>
Date: Tue, 6 Oct 2009 07:12:10 +0000 (+0000)
Subject: Fix VRRP script not running any more after reload.
X-Git-Tag: v1.2.1~30
X-Git-Url: http://git.formilux.org/?a=commitdiff_plain;h=ef1db4ba5b7697bcd8c43acc722301d8b848cc6e;p=people%2Falex%2Fkeepalived.git

Fix VRRP script not running any more after reload.

After a reload, if a script was successful before reload and is still
present in the new configuration, its result was set to rise value to
keep its success status. However, in vrrp_init_script(), it was not
registered any more. Therefore, we set result to
VRRP_SCRIPT_STATUS_INIT_GOOD on reload and this will be changed to
rise value in vrrp_init_script() later (while registering it).
---

diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c
index 589ccf9..a0673f0 100644
--- a/keepalived/vrrp/vrrp.c
+++ b/keepalived/vrrp/vrrp.c
@@ -1190,7 +1190,7 @@ clear_diff_script(void)
 			if (nvscript) {
 				log_message(LOG_INFO, "VRRP_Script(%s) considered successful on reload",
 					   nvscript->sname);
-				nvscript->result = nvscript->rise;
+				nvscript->result = VRRP_SCRIPT_STATUS_INIT_GOOD;
 			}
 		}
 	}