From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 12 Oct 2016 21:01:51 +0000 (+0200)
Subject: unbound: start prior network
X-Git-Tag: v2.19-core106~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=693928d781bee3151d5108a6f68a464202e78eeb;p=people%2Fstevee%2Fipfire-2.x.git

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 5cf7061fa8..a8077603b8 100644
--- 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 352fac63aa..6ec7c63b11 100644
--- 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 352fac63aa..6ec7c63b11 100644
--- 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 258ad85a14..fd363f321b 100644
--- 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 09d183e461..c3609afda4 100644
--- 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 4369ffe413..c5baf680a7 100644
--- 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