aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLech Perczak <lech.perczak@gmail.com>2021-11-06 17:56:03 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2023-04-29 21:33:05 +0200
commitd256ab730910a638dc61a2ee1c01576404dab52e (patch)
tree566004b838c69fcb7354d39086644da3ce7d921a
parentaa7873a9e6f69f04cafcbb37a6b3ad1f4e6f1a69 (diff)
downloadupstream-d256ab730910a638dc61a2ee1c01576404dab52e.tar.gz
upstream-d256ab730910a638dc61a2ee1c01576404dab52e.tar.bz2
upstream-d256ab730910a638dc61a2ee1c01576404dab52e.zip
umbim: include MBIM-provided DNS servers also with DHCP mode
In MBIM interfaces, DNS servers may be provided out-of-band regardless whether DHCP is used for configuration, or not. Move the DNS configuration outside "if" blocks to support that. Signed-off-by: Lech Perczak <lech.perczak@gmail.com>
-rwxr-xr-xpackage/network/utils/umbim/files/lib/netifd/proto/mbim.sh33
1 files changed, 18 insertions, 15 deletions
diff --git a/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh b/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
index da3f484223..bf07137fc4 100755
--- a/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
+++ b/package/network/utils/umbim/files/lib/netifd/proto/mbim.sh
@@ -217,18 +217,19 @@ _proto_mbim_setup() {
json_close_array
json_add_string gateway $(_proto_mbim_get_field ipv4gateway "$mbimconfig")
-
- [ "$peerdns" = 0 ] || {
- json_add_array dns
- for server in $(_proto_mbim_get_field ipv4dnsserver "$mbimconfig"); do
- json_add_string "" "$server"
- done
- json_close_array
- }
elif [ "$dhcp" != 0 ]; then
echo "mbim[$$]" "Starting DHCP on $ifname"
json_add_string proto "dhcp"
fi
+
+ [ "$peerdns" = 0 ] || {
+ json_add_array dns
+ for server in $(_proto_mbim_get_field ipv4dnsserver "$mbimconfig"); do
+ json_add_string "" "$server"
+ done
+ json_close_array
+ }
+
proto_add_dynamic_defaults
[ -n "$zone" ] && json_add_string zone "$zone"
[ -n "$ip4table" ] && json_add_string ip4table "$ip4table"
@@ -258,18 +259,20 @@ _proto_mbim_setup() {
json_add_string ip6gw $(_proto_mbim_get_field ipv6gateway "$mbimconfig")
- [ "$peerdns" = 0 ] || {
- json_add_array dns
- for server in $(_proto_mbim_get_field ipv6dnsserver "$mbimconfig"); do
- json_add_string "" "$server"
- done
- json_close_array
- }
elif [ "$dhcpv6" != 0 ]; then
echo "mbim[$$]" "Starting DHCPv6 on $ifname"
json_add_string proto "dhcpv6"
json_add_string extendprefix 1
fi
+
+ [ "$peerdns" = 0 ] || {
+ json_add_array dns
+ for server in $(_proto_mbim_get_field ipv6dnsserver "$mbimconfig"); do
+ json_add_string "" "$server"
+ done
+ json_close_array
+ }
+
proto_add_dynamic_defaults
[ -n "$zone" ] && json_add_string zone "$zone"
[ -n "$ip6table" ] && json_add_string ip6table "$ip6table"