Merge pull request #14661 from TDT-AG/pr/20210203-19.07-keepalived

keepalived: backport fixes
This commit is contained in:
Florian Eckert 2021-03-03 10:01:24 +01:00 committed by GitHub
commit 8c63f6331c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=keepalived
PKG_VERSION:=2.0.18
PKG_RELEASE:=2
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.keepalived.org/software
@ -86,7 +86,8 @@ endef
CONFIGURE_ARGS+= \
--with-init=SYSV \
--disable-nftables
--disable-nftables \
--with-run-dir="/var/run"
ifeq ($(CONFIG_KEEPALIVED_VRRP),)
CONFIGURE_ARGS += \

View file

@ -104,6 +104,9 @@ global_defs() {
config_get_bool linkbeat_use_polling "$1" linkbeat_use_polling 0
[ "$linkbeat_use_polling" -gt 0 ] && printf 'linkbeat_use_polling\n\n' >> "$KEEPALIVED_CONF"
printf '%bscript_user root\n' "${INDENT_1}" >> "$KEEPALIVED_CONF"
printf '%benable_script_security\n' "${INDENT_1}" >> "$KEEPALIVED_CONF"
config_get notification_email "$1" notification_email
print_list_indent notification_email