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 a6775027eddd5e8c4e8c3db96f03734cbb89afb1..27686d1f3f831920cd094d7444a192d2906cdbd6 100644 (file)
--- 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
 
-       boot_mesg "Setting up DMZ pinholes"
-       /usr/local/bin/setdmzholes; evaluate_retval
+       # Enable netfilter accounting
+       sysctl net.netfilter.nf_conntrack_acct=1 > /dev/null
 
-       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}"
@@ -117,6 +114,11 @@ case "${DO}" in
                                /etc/rc.d/init.d/networking/red stop
                        fi
                fi
+
+               # Stopping dnsmasq if network all networks shutdown
+               [ "${ALL}" == "1" ] && /etc/rc.d/init.d/dnsmasq stop
+
+               exit 0
                ;;
 
        restart)