From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 10 Feb 2009 21:43:51 +0000 (+0100)
Subject: Fixed connection tracking bug (also in Core 27).
X-Git-Tag: v2.5-beta1~177
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=5e0f55e76bf0495af37854604a8042052afafb70;hp=6d1c42ad86c63742ce411ee804aebfd9f85840ae

Fixed connection tracking bug (also in Core 27).
---

diff --git a/config/rootfiles/core/27/files b/config/rootfiles/core/27/files
index 6accc6767f..8c55927fdb 100644
--- a/config/rootfiles/core/27/files
+++ b/config/rootfiles/core/27/files
@@ -29,3 +29,4 @@ srv/web/ipfire/cgi-bin/updatexlrator.cgi
 var/ipfire/langs
 lib/modules/2.6.25.19-ipfire/kernel/drivers/net/imq.ko
 var/ipfire/qos/bin/makeqosscripts.pl
+etc/init.d/network
diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index 90f811384c..9c7e3ac11e 100644
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -19,10 +19,10 @@ eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 init_networking() {
 	boot_mesg "Loading firewall modules into the kernel"
 	modprobe iptable_nat || failed=1
-	for i in $(find /lib/modules/$(uname -r) -name ip_conntrack*); do
+	for i in $(find /lib/modules/$(uname -r) -name nf_conntrack*); do
 		modprobe $(basename $i | cut -d. -f1) || failed=1
 	done
-	for i in $(find /lib/modules/$(uname -r) -name ip_nat*); do
+	for i in $(find /lib/modules/$(uname -r) -name nf_nat*); do
 		modprobe $(basename $i | cut -d. -f1) || failed=1
 	done
 	(exit ${failed})