Forward Firewall: reorganised ruletable layout

[people/teissler/ipfire-2.x.git] / lfs / initscripts

diff --git a/lfs/initscripts b/lfs/initscripts
index 573c81e19f888d7fb81bff6ead0ef6d92c63166a..091b61a4253b961d50d23ae085ced9a101924c74 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -173,23 +173,21 @@ $(TARGET) :
        ln -sf ../init.d/localnet    /etc/rc.d/rcsysinit.d/S80localnet
        ln -sf ../init.d/sysctl      /etc/rc.d/rcsysinit.d/S90sysctl
        ln -sf ../init.d/network-vlans /etc/rc.d/rcsysinit.d/S91network-vlans
+       ln -sf ../init.d/wlanclient  /etc/rc.d/rc0.d/K82wlanclient
+       ln -sf ../init.d/wlanclient  /etc/rc.d/rc3.d/S19wlanclient
+       ln -sf ../init.d/wlanclient  /etc/rc.d/rc6.d/K82wlanclient
 
        ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
        ln -sf ../../firewall /etc/rc.d/init.d/networking/red.up/20-RL-firewall
-       ln -sf ../../../../../usr/local/bin/outgoingfwctrl \
-               /etc/rc.d/init.d/networking/red.up/22-outgoingfwctrl
+       ln -sf ../../../../../usr/local/bin/forwardfwctrl \
+               /etc/rc.d/init.d/networking/red.up/23-forwardfwctrl
        ln -sf ../../../../../usr/local/bin/snortctrl \
-               /etc/rc.d/init.d/networking/red.up/23-RS-snort
+               /etc/rc.d/init.d/networking/red.up/24-RS-snort
        ln -sf ../../../../../usr/local/bin/qosctrl \
-               /etc/rc.d/init.d/networking/red.up/24-RS-qos
-       ln -sf ../../../../../usr/local/bin/setportfw \
-               /etc/rc.d/init.d/networking/red.up/25-portfw
-       ln -sf ../../../../../usr/local/bin/setxtaccess \
-               /etc/rc.d/init.d/networking/red.up/26-xtaccess
+               /etc/rc.d/init.d/networking/red.up/25-RS-qos
        ln -sf ../../../../../usr/local/bin/dialctrl.pl \
                /etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
-       ln -sf ../../squid /etc/rc.d/init.d/networking/red.up/27-RS-squid
-       
+       ln -sf ../../squid /etc/rc.d/init.d/networking/red.up/28-RS-squid
        ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
        ln -sf ../../firewall /etc/rc.d/init.d/networking/red.down/20-RL-firewall
        ln -sf ../../../../../usr/local/bin/dialctrl.pl \
@@ -199,10 +197,13 @@ $(TARGET) :
                ln -sf any /etc/rc.d/init.d/networking/$$i; \
        done
 
-       # ARM does not need checkfstab
+       # ARM does not need checkfstab and acpid
 ifeq "$(MACHINE_TYPE)" "arm"
-       rm -vf /etc/rc.d/init.d/checkfstab
+       rm -vf /etc/rc.d/init.d/{acpid,checkfstab}
 else
+       ln -sf ../init.d/acpid       /etc/rc.d/rc3.d/S12acpid
+       ln -sf ../init.d/acpid       /etc/rc.d/rc0.d/K87acpid
+       ln -sf ../init.d/acpid       /etc/rc.d/rc6.d/K87acpid
        ln -sf ../init.d/checkfstab  /etc/rc.d/rcsysinit.d/S19checkfstab
 endif