firewall: Load conntrack modules in firewall script.

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 2bb8ba1562be24926d019814e50af8ccee6db652..1d4146d2c9c91696a7f769bdba17b7f8937daf8f 100644 (file)
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -292,6 +292,24 @@ iptables_red() {
 # See how we were called.
 case "$1" in
   start)
 # See how we were called.
 case "$1" in
   start)

+       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
+               rmmod nf_nat_h323
+               rmmod nf_conntrack_h323
+       fi
+

        boot_mesg "Setting up firewall"
        iptables_init
        evaluate_retval
        boot_mesg "Setting up firewall"
        iptables_init
        evaluate_retval

diff --git a/src/initscripts/init.d/network b/src/initscripts/init.d/network
index 6b49274eb62d98a5832aeb781fc8ea2504582a70..5aecd1557d0742097fdf263a175ecc8b04da229d 100644 (file)
--- a/src/initscripts/init.d/network
+++ b/src/initscripts/init.d/network
@@ -17,24 +17,6 @@
 eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 
 init_networking() {
 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
-               rmmod nf_nat_h323
-               rmmod nf_conntrack_h323
-       fi
-

        /etc/rc.d/init.d/dnsmasq start
        /etc/rc.d/init.d/static-routes start
 }
        /etc/rc.d/init.d/dnsmasq start
        /etc/rc.d/init.d/static-routes start
 }