From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 26 Jun 2011 16:09:03 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.9-core53~87
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=117e37e35699860267699b5662516964b59e3eb2;hp=ea2b3bf4d5033ff99a89d3a5361663837d88aff8

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 0c2ca2cc43..dca50befa6 100644
--- 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 18df10798b..d6455137ff 100644
--- 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