From f0092a6e3e246846caa55458364514064f2c5103 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 13 Jan 2019 12:50:26 +0100 Subject: [PATCH] keepalived: Move change of conntrack sysctl option into package The setting cannot be set on the default system because the ip_vs module is not loaded by default and there is no reason to load it just because we would be able to set the setting. Signed-off-by: Michael Tremer --- config/etc/sysctl.conf | 3 --- lfs/keepalived | 2 +- src/initscripts/packages/keepalived | 6 ++++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf index dd087d2d97..4066af767b 100644 --- a/config/etc/sysctl.conf +++ b/config/etc/sysctl.conf @@ -26,9 +26,6 @@ net.ipv4.conf.all.accept_redirects = 0 net.ipv4.conf.all.accept_source_route = 0 net.ipv4.conf.all.log_martians = 1 -# Enable connection tracking for IPVS -net.ipv4.vs.conntrack = 1 - kernel.printk = 1 4 1 7 vm.swappiness=1 vm.mmap_min_addr = 4096 diff --git a/lfs/keepalived b/lfs/keepalived index 4b4ae2300a..8e01e979da 100644 --- a/lfs/keepalived +++ b/lfs/keepalived @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = keepalived -PAK_VER = 4 +PAK_VER = 5 DEPS = "" diff --git a/src/initscripts/packages/keepalived b/src/initscripts/packages/keepalived index baccdc15a3..4dda336d55 100644 --- a/src/initscripts/packages/keepalived +++ b/src/initscripts/packages/keepalived @@ -13,6 +13,12 @@ case "${1}" in start) + # Load IPVS module + modprobe ip_vs + + # Enable connection tracking for IPVS + sysctl -w net.ipv4.vs.conntrack=1 &>/dev/null + boot_mesg "Starting keepalive daemon..." loadproc /usr/sbin/keepalived ${KEEPALIVED_OPTIONS} ;; -- 2.39.2