X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Finitscripts%2Finit.d%2Fnetwork;h=27686d1f3f831920cd094d7444a192d2906cdbd6;hb=e7c5b9dabb9dbd724b04b01a627573727c6d23f2;hp=c773b83c2cac7204bed04646136aa99f64ebe924;hpb=9c7da0c6d9adc6020a4815a90f0bb5930d57a97b;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index c773b83c2..27686d1f3 100644
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -28,30 +28,21 @@ init_networking() {
 	(exit ${failed})
 	evaluate_retval
 
+	# Enable netfilter accounting
+	sysctl net.netfilter.nf_conntrack_acct=1 > /dev/null
+
 	if [ -e /var/ipfire/main/disable_nf_sip ]; then
 		rmmod nf_nat_sip
 		rmmod nf_conntrack_sip
+		rmmod nf_nat_h323
+		rmmod nf_conntrack_h323
 	fi
 
 	boot_mesg "Setting up firewall"
 	/etc/rc.d/init.d/firewall start; evaluate_retval
 
-#	boot_mesg "Setting up traffic accounting"
-#	/etc/rc.d/helper/writeipac.pl || failed=1
-#	/usr/sbin/fetchipac -S || failed=1
-#	(exit ${failed})
-#	evaluate_retval
-
-	boot_mesg "Setting up DMZ pinholes"
-	/usr/local/bin/setdmzholes; evaluate_retval
-
-	if [ "$CONFIG_TYPE" = "3" -o "$CONFIG_TYPE" = "4" ]; then
-		boot_mesg "Setting up wireless firewall rules"
-		/usr/local/bin/wirelessctrl; evaluate_retval
-	fi
-
 	/etc/rc.d/init.d/dnsmasq start
-	/etc/rc.d/init.d/static-routing start
+	/etc/rc.d/init.d/static-routes start
 }
 
 DO="${1}"