From 6f439254d693714c4929452cd96720f61455d762 Mon Sep 17 00:00:00 2001 From: Rishabh Date: Mon, 30 Mar 2026 20:41:40 +0530 Subject: [PATCH 1/9] keepalived: Fixed print_track_script_indent function This function was not correctly parsing track_script. Removed option value as it was of no use and replaced it with existing option name. Removed check where the section and option name had to be equal Signed-off-by: Rishabh --- net/keepalived/files/keepalived.init | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/net/keepalived/files/keepalived.init b/net/keepalived/files/keepalived.init index ac59c8103fe7f..8cc4a847942c7 100644 --- a/net/keepalived/files/keepalived.init +++ b/net/keepalived/files/keepalived.init @@ -215,16 +215,14 @@ print_track_script_indent() { local name value weight direction config_get name "$section" name - [ "$name" != "$curr_track_elem" ] && return 0 + if [ -z "$name" ] && return 0 - config_get value "$section" value config_get weight "$section" weight config_get direction "$section" direction - [ -z "$value" ] && return 0 [ "$direction" != "reverse" ] && [ "$direction" != "noreverse" ] && unset direction - printf '%b%s' "$indent" "$value" >> "$KEEPALIVED_CONF" + printf '%b%s' "$indent" "$name" >> "$KEEPALIVED_CONF" [ -n "$weight" ] && printf ' weight %s' "$weight ${direction:+${direction}}" >> "$KEEPALIVED_CONF" printf '\n' >> "$KEEPALIVED_CONF" } @@ -333,7 +331,7 @@ vrrp_sync_group() { config_get group "$1" group [ -z "$group" ] && return 0 - # Check if we have 'vrrp_instance's defined for + # Check if we have 'vrrp_instance's defined for # each member and remove names with not vrrp_instance defined for m in $group; do vrrp_instance_check "$m" && valid_group="$valid_group $m" @@ -670,4 +668,3 @@ start_service() { procd_set_param respawn procd_close_instance } - From 6d48739c71df9dab76802784a9583b4f8dd0bde5 Mon Sep 17 00:00:00 2001 From: Rishabh Date: Mon, 30 Mar 2026 20:43:47 +0530 Subject: [PATCH 2/9] keepalived: Added track_script option for sync group track_script was not present for sync_group. note that with sync group, option priority doesnt work with vrrp_script Signed-off-by: Rishabh --- net/keepalived/files/keepalived.init | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/net/keepalived/files/keepalived.init b/net/keepalived/files/keepalived.init index 8cc4a847942c7..0b9f82cbd7b7f 100644 --- a/net/keepalived/files/keepalived.init +++ b/net/keepalived/files/keepalived.init @@ -345,6 +345,17 @@ vrrp_sync_group() { print_elems_indent "$1" "$INDENT_1" no_val_smtp_alert no_val_global_tracking + # Handle track_script list for sync group + local track_script_val + config_get track_script_val "$1" track_script + if [ -n "$track_script_val" ]; then + printf '%btrack_script {\n' "${INDENT_1}" >> "$KEEPALIVED_CONF" + for t in $track_script_val; do + config_foreach print_track_script_indent vrrp_script "$t" "$INDENT_2" + done + printf '%b}\n' "${INDENT_1}" >> "$KEEPALIVED_CONF" + fi + print_notify "GROUP" "$name" "$INDENT_1" notify_backup notify_master \ notify_fault notify From 169fcb74ef70ffd0c13551984ba420fbc8866de7 Mon Sep 17 00:00:00 2001 From: Rishabh Date: Mon, 30 Mar 2026 20:48:29 +0530 Subject: [PATCH 3/9] keepalived: Updated keepalived.config added a bit of documentation for vrrp_script for the missing options added new option for vrrp_sync_group Signed-off-by: Rishabh --- net/keepalived/files/keepalived.config | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/net/keepalived/files/keepalived.config b/net/keepalived/files/keepalived.config index 4410514c42154..138efecbf047a 100644 --- a/net/keepalived/files/keepalived.config +++ b/net/keepalived/files/keepalived.config @@ -75,9 +75,12 @@ config globals 'globals' # list route "route1" #config vrrp_sync_group -# option name "VI_sync_group_1" -# list group "VI_1" -# list group "VI_2" +# option name "VI_sync_group_1" +# list group "VI_1" +# list group "VI_2" +# Note that priority will not work with vrrp_script +# when in sync group +# list track_script "vrrp_script1" # option smtp_alert "1" # option global_tracking 1 @@ -132,11 +135,15 @@ config globals 'globals' # option accept "1" #config vrrp_script +# option name "vrrp_script1" # option script "" # option interval "5" +# weight will increase +10 if script status is OK, otherwise -10 # option weight "10" # option fall "2" # option rise "3" +# valid values for direction reverse|noreverse -- reverse flips weight change +# option direction "reverse" #config virtual_server # option enabled "1" From b956c7fdc74595c7181f4447cfcff1152eaedac4 Mon Sep 17 00:00:00 2001 From: Rishabh Date: Mon, 30 Mar 2026 20:57:14 +0530 Subject: [PATCH 4/9] keepalived: Added option timeout in vrrp_script. Added option timeout in vrrp_script section Made corresponding changes to keepalived.config as well Signed-off-by: Rishabh --- net/keepalived/files/keepalived.config | 2 +- net/keepalived/files/keepalived.init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/keepalived/files/keepalived.config b/net/keepalived/files/keepalived.config index 138efecbf047a..db0c3d2645257 100644 --- a/net/keepalived/files/keepalived.config +++ b/net/keepalived/files/keepalived.config @@ -144,6 +144,7 @@ config globals 'globals' # option rise "3" # valid values for direction reverse|noreverse -- reverse flips weight change # option direction "reverse" +# option timeout "5" #config virtual_server # option enabled "1" @@ -198,4 +199,3 @@ config globals 'globals' # option name "url2" # option path "/testurl/test2.jsp" # option digest "22" - diff --git a/net/keepalived/files/keepalived.init b/net/keepalived/files/keepalived.init index 0b9f82cbd7b7f..a80de8eaf7ba0 100644 --- a/net/keepalived/files/keepalived.init +++ b/net/keepalived/files/keepalived.init @@ -475,7 +475,7 @@ vrrp_script() { config_section_open "vrrp_script" "$name" - print_elems_indent "$1" "$INDENT_1" script interval weight fall rise + print_elems_indent "$1" "$INDENT_1" script interval weight fall rise timeout config_section_close } From 2983ba4d283278d32b828c5df963cd1a5fb7a899 Mon Sep 17 00:00:00 2001 From: Rishabh Date: Mon, 30 Mar 2026 20:59:29 +0530 Subject: [PATCH 5/9] keepalived: changed curr_track_elem in vrrp_instance In the section handling the parsing of track script for vrrp_instance, changed curr_track_elem to vrrp_script Signed-off-by: Rishabh --- net/keepalived/files/keepalived.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/keepalived/files/keepalived.init b/net/keepalived/files/keepalived.init index a80de8eaf7ba0..13a188227f570 100644 --- a/net/keepalived/files/keepalived.init +++ b/net/keepalived/files/keepalived.init @@ -422,7 +422,7 @@ vrrp_instance() { [ -z "$optval" ] && continue printf '%b%s {\n' "${INDENT_1}" "$opt" >> "$KEEPALIVED_CONF" for t in $optval; do - config_foreach print_track_script_indent track_script "$t" "$INDENT_2" + config_foreach print_track_script_indent vrrp_script "$t" "$INDENT_2" done printf '%b}\n' "${INDENT_1}" >> "$KEEPALIVED_CONF" done From e527de8c5df5c733a58aecfd42eee7634dd387b8 Mon Sep 17 00:00:00 2001 From: Rishabh Date: Mon, 30 Mar 2026 21:01:05 +0530 Subject: [PATCH 6/9] keepalived: Bumped keepalived PKG_RELEASE to 3 Signed-off-by: Rishabh --- net/keepalived/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/keepalived/Makefile b/net/keepalived/Makefile index 95e10dfd31a8b..67f7e0231274f 100644 --- a/net/keepalived/Makefile +++ b/net/keepalived/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=keepalived PKG_VERSION:=2.3.3 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.keepalived.org/software From 4285957cb250698f443a6ee9c62b089070fdd707 Mon Sep 17 00:00:00 2001 From: Rishabh Date: Tue, 31 Mar 2026 14:11:37 +0530 Subject: [PATCH 7/9] keepalived: Removed keyword 'if' Removed an if statement that got pushed by mistake Signed-off-by: Rishabh --- net/keepalived/files/keepalived.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/keepalived/files/keepalived.init b/net/keepalived/files/keepalived.init index 13a188227f570..f178e32d369b7 100644 --- a/net/keepalived/files/keepalived.init +++ b/net/keepalived/files/keepalived.init @@ -215,7 +215,7 @@ print_track_script_indent() { local name value weight direction config_get name "$section" name - if [ -z "$name" ] && return 0 + [ -z "$name" ] && return 0 config_get weight "$section" weight config_get direction "$section" direction From 8848d0b8c9c6d2f4bd6c750f25b47aee9042360f Mon Sep 17 00:00:00 2001 From: Rishabh Date: Tue, 31 Mar 2026 16:56:25 +0530 Subject: [PATCH 8/9] keepalived: added back the trailing lines Signed-off-by: Rishabh --- net/keepalived/files/keepalived.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/keepalived/files/keepalived.init b/net/keepalived/files/keepalived.init index f178e32d369b7..56ef8efd4c693 100644 --- a/net/keepalived/files/keepalived.init +++ b/net/keepalived/files/keepalived.init @@ -331,7 +331,7 @@ vrrp_sync_group() { config_get group "$1" group [ -z "$group" ] && return 0 - # Check if we have 'vrrp_instance's defined for + # Check if we have 'vrrp_instance's defined for # each member and remove names with not vrrp_instance defined for m in $group; do vrrp_instance_check "$m" && valid_group="$valid_group $m" From 70f77b5b6481407c71ac90099ba075dbfebe9a8e Mon Sep 17 00:00:00 2001 From: Rishabh Date: Sun, 5 Apr 2026 18:22:50 +0530 Subject: [PATCH 9/9] keepalived: added new line ending --- net/keepalived/files/keepalived.init | 1 + 1 file changed, 1 insertion(+) diff --git a/net/keepalived/files/keepalived.init b/net/keepalived/files/keepalived.init index 56ef8efd4c693..fca0572274276 100644 --- a/net/keepalived/files/keepalived.init +++ b/net/keepalived/files/keepalived.init @@ -679,3 +679,4 @@ start_service() { procd_set_param respawn procd_close_instance } +