Merge branch 'next' of https://github.com/ipfire/ipfire-2.x into feature_firewalllog_...

[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 c773b83c2cac7204bed04646136aa99f64ebe924..5aecd1557d0742097fdf263a175ecc8b04da229d 100644 (file)
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -17,41 +17,8 @@
 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 nf_conntrack*); do
-               modprobe $(basename $i | cut -d. -f1) || failed=1
-       done
-       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
-       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}"