network: Remove redundant insertion of wireless rules.

[people/teissler/ipfire-2.x.git] / src / initscripts / init.d / network

diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index 9de3994cd3e354d7431e51b12c20b05e067837fe..27686d1f3f831920cd094d7444a192d2906cdbd6 100644 (file)
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -28,6 +28,9 @@ 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
@@ -38,20 +41,6 @@ init_networking() {
        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-routes start
 }