From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 6 Oct 2020 12:26:43 +0000 (+0000)
Subject: Revert "core152: Load changed /etc/sysctl.conf"
X-Git-Tag: v2.25-core152~7^2~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcbcd15f64e90a077637af261bdf0f976f846c9a;p=ipfire-2.x.git

Revert "core152: Load changed /etc/sysctl.conf"

This reverts commit b125988d3fe0e9f9ac231bf821e59365cf74f268.

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

diff --git a/config/rootfiles/core/152/filelists/files b/config/rootfiles/core/152/filelists/files
index c72b45b050..0894d828f1 100644
--- a/config/rootfiles/core/152/filelists/files
+++ b/config/rootfiles/core/152/filelists/files
@@ -1,4 +1,3 @@
 etc/system-release
 etc/issue
-etc/sysctl.conf
 srv/web/ipfire/cgi-bin/credits.cgi
diff --git a/config/rootfiles/core/152/update.sh b/config/rootfiles/core/152/update.sh
index 715fa5a7a5..5a667aa36c 100644
--- a/config/rootfiles/core/152/update.sh
+++ b/config/rootfiles/core/152/update.sh
@@ -49,9 +49,6 @@ ldconfig
 
 # Start services
 
-# Reload sysctl.conf
-sysctl -p
-
 # This update needs a reboot...
 #touch /var/run/need_reboot