From faf19107286191ce3009d2ffc18c5511358db23d Mon Sep 17 00:00:00 2001 From: Johannes Kimmel Date: Wed, 6 Jan 2021 10:18:44 +0100 Subject: [PATCH 1/3] fff-dhcp: remove unused dns server entries These entries are overwritten by any call to `configuregateway`. Since they never get used, they should be removed. Signed-off-by: Johannes Kimmel --- .../fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp b/src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp index 5b59aafd..8bffbf01 100644 --- a/src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp +++ b/src/packages/fff/fff-dhcp/files/etc/uci-defaults/90-fff-dhcp @@ -17,12 +17,6 @@ uci batch >/dev/null < Date: Wed, 6 Jan 2021 10:22:35 +0100 Subject: [PATCH 2/3] fff-dhcp: add fallback dns server If the user did not specify a dns server, set a fallback. Since we already have multiple servers available on an anycast address, this address is chosen instead of as specific server. This should avoid the issue that the default server might deprecate suddenly. A warning is still displayed to remind the user to conscientiously choose a server and not rely on defaults. Signed-off-by: Johannes Kimmel --- src/packages/fff/fff-dhcp/files/etc/layer3.d/35-dns | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/packages/fff/fff-dhcp/files/etc/layer3.d/35-dns b/src/packages/fff/fff-dhcp/files/etc/layer3.d/35-dns index ad9f1cdc..bb42c6b7 100644 --- a/src/packages/fff/fff-dhcp/files/etc/layer3.d/35-dns +++ b/src/packages/fff/fff-dhcp/files/etc/layer3.d/35-dns @@ -8,7 +8,10 @@ configure() { uci add_list dhcp.@dnsmasq[0].server="/ip6.arpa/$f" done else - echo "WARNING: No DNS servers set!" + echo "WARNING: No DNS servers set! Using default server fd43:5602:29bd:ffff:1:1:1:1" + uci add_list dhcp.@dnsmasq[0].server="fd43:5602:29bd:ffff:1:1:1:1" + uci add_list dhcp.@dnsmasq[0].server="/in-addr.arpa/fd43:5602:29bd:ffff:1:1:1:1" + uci add_list dhcp.@dnsmasq[0].server="/ip6.arpa/fd43:5602:29bd:ffff:1:1:1:1" fi } -- 2.39.2 From a4fea5022e5a2f8e51bed150e5045e2665afd1e8 Mon Sep 17 00:00:00 2001 From: Johannes Kimmel Date: Wed, 6 Jan 2021 10:32:02 +0100 Subject: [PATCH 3/3] fff-dhcp: PKG_RELEASE bump Signed-off-by: Johannes Kimmel --- src/packages/fff/fff-dhcp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/fff/fff-dhcp/Makefile b/src/packages/fff/fff-dhcp/Makefile index cb968948..d1507625 100644 --- a/src/packages/fff/fff-dhcp/Makefile +++ b/src/packages/fff/fff-dhcp/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-dhcp -PKG_RELEASE:=5 +PKG_RELEASE:=6 include $(INCLUDE_DIR)/package.mk -- 2.39.2