From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 26 Jun 2011 16:08:40 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=4b492e272b065ae89b17fbf63d2244b0d1d1660e;hp=54c5f690106865fd43584eeec4f5b7108c938755

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 0c2ca2cc4..dca50befa 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 18df10798..d6455137f 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