Merge branch 'master' into fifteen

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

diff --git a/lfs/initscripts b/lfs/initscripts
index 6549147a83afdf68735c2ff3e5503318df3d4bb2..eae451b24ca912d1efe6490377942fcd67204a41 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -179,20 +179,15 @@ $(TARGET) :
 
        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/firewallctrl \
+               /etc/rc.d/init.d/networking/red.up/22-forwardfwctrl
        ln -sf ../../../../../usr/local/bin/snortctrl \
                /etc/rc.d/init.d/networking/red.up/23-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
        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 ../../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 \