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 <michael.tremer@ipfire.org>

diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf
index dd087d2d97a77ed52af9b557a73a2935dc1c2908..4066af767b2876eefbb87f872f5342cf5c78e705 100644 (file)
--- 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 4b4ae2300aed43ce2cb1397bb648a59942592e3f..8e01e979da8dc538af4b20d7b97777c35b97a8f1 100644 (file)
--- 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 baccdc15a3765ae121f4c08e021bb6b8643e3054..4dda336d558a97b3a16cdcc945da642d95cac5c3 100644 (file)
--- 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}
                ;;