From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 30 Sep 2020 17:16:12 +0000 (+0000)
Subject: core151: Ship & load /etc/sysctl.conf
X-Git-Tag: v2.25-core151~8^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74f47b18b1715d239639d135117a3c9f7b4b3755;p=ipfire-2.x.git

core151: Ship & load /etc/sysctl.conf

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/151/filelists/files b/config/rootfiles/core/151/filelists/files
index bee0dabd50..8223d97de5 100644
--- a/config/rootfiles/core/151/filelists/files
+++ b/config/rootfiles/core/151/filelists/files
@@ -3,6 +3,7 @@ etc/issue
 etc/rc.d/helper/exoscale-setup
 etc/rc.d/init.d/cloud-init
 etc/rc.d/init.d/functions
+etc/sysctl.conf
 srv/web/ipfire/cgi-bin/country.cgi
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/ipinfo.cgi
diff --git a/config/rootfiles/core/151/update.sh b/config/rootfiles/core/151/update.sh
index 69e34ae815..16135b2efe 100644
--- a/config/rootfiles/core/151/update.sh
+++ b/config/rootfiles/core/151/update.sh
@@ -57,6 +57,9 @@ if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
 fi
 /etc/init.d/collectd restart
 
+# Reload sysctl.conf
+sysctl -p
+
 # This update needs a reboot...
 #touch /var/run/need_reboot