Merge branch 'next' into initscripts-cleanup

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

diff --git a/lfs/initscripts b/lfs/initscripts
index e731d7f6d38e97c3d2f9353737be4b68286fc18b..ef7114c90eca0479d851db451df6d8314c058c38 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -64,22 +64,22 @@ $(TARGET) :
        # Create default ramdisk configuration
        echo "RAMDISK_MODE=0" > /etc/sysconfig/ramdisk
 
-       for i in $(DIR_SRC)/src/initscripts/init.d/*; do \
+       for i in $(DIR_SRC)/src/initscripts/system/*; do \
                install -v -m 754 $$i /etc/rc.d/init.d/; \
        done
        chmod 644 /etc/rc.d/init.d/functions
 
-       for i in $(DIR_SRC)/src/initscripts/init.d/networking/*; do \
+       for i in $(DIR_SRC)/src/initscripts/networking/*; do \
                if [ -f $$i ]; then \
                        install -v -m 754 $$i /etc/rc.d/init.d/networking/; \
                fi; \
        done
 
-       for i in $(DIR_SRC)/src/initscripts/init.d/networking/red.up/*; do \
+       for i in $(DIR_SRC)/src/initscripts/networking/red.up/*; do \
                install -v -m 754 $$i /etc/rc.d/init.d/networking/red.up/; \
        done
 
-       for i in $(DIR_SRC)/src/initscripts/init.d/networking/red.down/*; do \
+       for i in $(DIR_SRC)/src/initscripts/networking/red.down/*; do \
                install -v -m 754 $$i /etc/rc.d/init.d/networking/red.down/; \
        done
 
@@ -127,6 +127,9 @@ $(TARGET) :
        ln -sf ../init.d/network     /etc/rc.d/rc0.d/K80network
        ln -sf ../init.d/network     /etc/rc.d/rc3.d/S20network
        ln -sf ../init.d/network     /etc/rc.d/rc6.d/K80network
+       ln -sf ../init.d/unbound     /etc/rc.d/rc0.d/K79unbound
+       ln -sf ../init.d/unbound     /etc/rc.d/rc3.d/S11unbound
+       ln -sf ../init.d/unbound     /etc/rc.d/rc6.d/K79unbound
        ln -sf ../init.d/random      /etc/rc.d/rc0.d/K45random
        ln -sf ../init.d/random      /etc/rc.d/rc3.d/S25random
        ln -sf ../init.d/random      /etc/rc.d/rc6.d/K45random
@@ -185,13 +188,11 @@ $(TARGET) :
        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 ../../../../../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 ../../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
 
        for i in green blue orange; do \
                ln -sf any /etc/rc.d/init.d/networking/$$i; \