Don't load H323 conntrack modules by default.

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

diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index a4f190d529c67b6cb19e2236a895feeebd384c32..9de3994cd3e354d7431e51b12c20b05e067837fe 100644 (file)
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -19,15 +19,22 @@ 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
-                        
+
+       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
 
@@ -46,6 +53,7 @@ init_networking() {
        fi
 
        /etc/rc.d/init.d/dnsmasq start
+       /etc/rc.d/init.d/static-routes start
 }
 
 DO="${1}"
@@ -117,6 +125,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)