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

diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index a02c58581..27686d1f3 100644
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -19,33 +19,30 @@ 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})
 	evaluate_retval
-                        
-	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
+	# Enable netfilter accounting
+	sysctl net.netfilter.nf_conntrack_acct=1 > /dev/null
 
-	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
+	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
+
 	/etc/rc.d/init.d/dnsmasq start
+	/etc/rc.d/init.d/static-routes start
 }
 
 DO="${1}"
@@ -120,6 +117,8 @@ case "${DO}" in
 
 		# Stopping dnsmasq if network all networks shutdown
 		[ "${ALL}" == "1" ] && /etc/rc.d/init.d/dnsmasq stop
+
+		exit 0
 		;;
 
 	restart)