Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/core/50/filelists/files b/config/rootfiles/core/50/filelists/files
index 0c2ca2cc433836bbfbf0660786da661a89f2d04d..dca50befa6bc6e79938d0431a2cc958da6999b97 100644 (file)
--- a/config/rootfiles/core/50/filelists/files
+++ b/config/rootfiles/core/50/filelists/files
@@ -1,4 +1,3 @@
-etc/sysctl.conf
 etc/system-release
 var/ipfire/langs/
 etc/rc.d/init.d/console

diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files
index 18df10798be0f701366399dfbb99cd5f6476edd5..d6455137ffc112ee28a1d1b3203b36db6e794914 100644 (file)
--- a/config/rootfiles/core/next/filelists/files
+++ b/config/rootfiles/core/next/filelists/files
@@ -1,3 +1,4 @@
+etc/sysctl.conf
 etc/system-release
 etc/issue
 srv/web/ipfire/cgi-bin/extrahd.cgi