Просмотр исходного кода

netifd: strip mask from IP address in DHCP client params

ipaddr option can be in CIDR notation,
but udhcp wants just an IP address

Signed-off-by: Andrey Erokhin <[email protected]>
Andrey Erokhin 2 лет назад
Родитель
Сommit
506bb436c6
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      package/network/config/netifd/files/lib/netifd/proto/dhcp.sh

+ 1 - 1
package/network/config/netifd/files/lib/netifd/proto/dhcp.sh

@@ -67,7 +67,7 @@ proto_dhcp_setup() {
 		-p /var/run/udhcpc-$iface.pid \
 		-p /var/run/udhcpc-$iface.pid \
 		-s /lib/netifd/dhcp.script \
 		-s /lib/netifd/dhcp.script \
 		-f -t 0 -i "$iface" \
 		-f -t 0 -i "$iface" \
-		${ipaddr:+-r $ipaddr} \
+		${ipaddr:+-r ${ipaddr/\/*/}} \
 		${hostname:+-x "hostname:$hostname"} \
 		${hostname:+-x "hostname:$hostname"} \
 		${vendorid:+-V "$vendorid"} \
 		${vendorid:+-V "$vendorid"} \
 		$clientid $defaultreqopts $broadcast $norelease $dhcpopts
 		$clientid $defaultreqopts $broadcast $norelease $dhcpopts