unbound: Remove test to check if RED is up
Commit Message
This has caused some trouble in many environments and
I think it makes sense to disable this for now until
we have reworked the whole DNS thing.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
src/initscripts/system/unbound | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
@@ -48,22 +48,6 @@ read_name_servers() {
done 2>/dev/null | xargs echo
}
-check_red_has_carrier_and_ip() {
- # Interface configured ?
- [ ! -e "/var/ipfire/red/iface" ] && return 0;
-
- # Interface present ?
- [ ! -e "/sys/class/net/$(</var/ipfire/red/iface)" ] && return 0;
-
- # has carrier ?
- [ ! "$(</sys/class/net/$(</var/ipfire/red/iface)/carrier)" = "1" ] && return 0;
-
- # has ip ?
- [ "$(ip address show dev $(</var/ipfire/red/iface) | grep "inet")" = "" ] && return 0;
-
- return 1;
-}
-
config_header() {
echo "# This file is automatically generated and any changes"
echo "# will be overwritten. DO NOT EDIT!"
@@ -71,8 +55,7 @@ config_header() {
}
update_forwarders() {
- check_red_has_carrier_and_ip
- if [ "${USE_FORWARDERS}" = "1" -a "${?}" = "1" ]; then
+ if [ "${USE_FORWARDERS}" = "1" ]; then
local forwarders
local broken_forwarders
@@ -517,8 +500,7 @@ disable_dnssec() {
fix_time_if_dns_fail() {
# If DNS still not work try to init ntp with
# hardcoded ntp.ipfire.org (81.3.27.46)
- check_red_has_carrier_and_ip
- if [ -e "/var/ipfire/red/iface" -a "${?}" = "1" ]; then
+ if [ -e "/var/ipfire/red/iface" ]; then
host 0.ipfire.pool.ntp.org > /dev/null 2>&1
if [ "${?}" != "0" ]; then
boot_mesg "DNS still not functioning... Trying to sync time with ntp.ipfire.org (81.3.27.46)..."