unbound: start prior network

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index 5cf7061fa88f44d78a17fa6bbf22f13819e36470..a8077603b832c35c40e3f79c77f974ffa3324123 100644 (file)
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -181,7 +181,7 @@ etc/rc.d/rc3.d/S15fireinfo
 etc/rc.d/rc3.d/S19smartenabler
 etc/rc.d/rc3.d/S19wlanclient
 etc/rc.d/rc3.d/S20network
-etc/rc.d/rc3.d/S21unbound
+etc/rc.d/rc3.d/S11unbound
 etc/rc.d/rc3.d/S21leds
 etc/rc.d/rc3.d/S24cyrus-sasl
 etc/rc.d/rc3.d/S25random

diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 352fac63aa282d14d52ab6ee5e835b6e44afb2d8..6ec7c63b114710e9c2999f3fb4e76d27ee720270 100644 (file)
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -185,7 +185,7 @@ etc/rc.d/rc3.d/S15fireinfo
 etc/rc.d/rc3.d/S19smartenabler
 etc/rc.d/rc3.d/S19wlanclient
 etc/rc.d/rc3.d/S20network
-etc/rc.d/rc3.d/S21unbound
+etc/rc.d/rc3.d/S11unbound
 etc/rc.d/rc3.d/S21leds
 etc/rc.d/rc3.d/S24cyrus-sasl
 etc/rc.d/rc3.d/S25random

diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 352fac63aa282d14d52ab6ee5e835b6e44afb2d8..6ec7c63b114710e9c2999f3fb4e76d27ee720270 100644 (file)
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -185,7 +185,7 @@ etc/rc.d/rc3.d/S15fireinfo
 etc/rc.d/rc3.d/S19smartenabler
 etc/rc.d/rc3.d/S19wlanclient
 etc/rc.d/rc3.d/S20network
-etc/rc.d/rc3.d/S21unbound
+etc/rc.d/rc3.d/S11unbound
 etc/rc.d/rc3.d/S21leds
 etc/rc.d/rc3.d/S24cyrus-sasl
 etc/rc.d/rc3.d/S25random

diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/core/106/filelists/files
index 258ad85a14e92a73c62909ef5033ac10218715cc..fd363f321b60ae1eb53aaf9ce68b25c649837152 100644 (file)
--- a/config/rootfiles/core/106/filelists/files
+++ b/config/rootfiles/core/106/filelists/files
@@ -10,7 +10,7 @@ etc/rc.d/init.d/ntp
 etc/rc.d/init.d/setclock
 etc/rc.d/init.d/unbound
 etc/rc.d/rc0.d/K79unbound
-etc/rc.d/rc3.d/S21unbound
+etc/rc.d/rc3.d/S11unbound
 etc/rc.d/rc6.d/K79unbound
 srv/web/ipfire/cgi-bin/dns.cgi
 srv/web/ipfire/cgi-bin/dnsforward.cgi

diff --git a/config/rootfiles/core/106/update.sh b/config/rootfiles/core/106/update.sh
index 09d183e461c65e80a68dd0fc0d79fed4c97a1d53..c3609afda46351159d8d03e7f8cfaf0b562b6045 100644 (file)
--- a/config/rootfiles/core/106/update.sh
+++ b/config/rootfiles/core/106/update.sh
@@ -55,6 +55,9 @@ rm -vf \
        /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq \
        /usr/sbin/dnsmasq
 
+# delete unbound link after network start
+rm -vf /etc/rc.d/rc3.d/S21unbound
+
 # Delete old net-traffic stuff
 rm -vrf \
        /etc/rc.d/helper/writeipac.pl \

diff --git a/lfs/initscripts b/lfs/initscripts
index 4369ffe413755baeb3979955b89e61e59228ecaa..c5baf680a7c1b69af867fb053d737f3f982c18f0 100644 (file)
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -128,7 +128,7 @@ $(TARGET) :
        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/S21unbound
+       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