diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 2c550ef554..a66f87d38d 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netifd -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh index 1c0f720f4a..e5724ff11f 100755 --- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh +++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh @@ -3,6 +3,7 @@ [ -x /sbin/udhcpc ] || exit 0 . /lib/functions.sh +. /lib/functions/network.sh . ../netifd-proto.sh . /lib/config/uci.sh init_proto "$@" @@ -37,11 +38,11 @@ proto_dhcp_get_default_clientid() { local iface="$1" local duid - local iaid="0" + local iaid - [ -e "/sys/class/net/$iface/ifindex" ] && iaid="$(cat "/sys/class/net/$iface/ifindex")" - duid="$(uci_get network @globals[0] dhcp_default_duid)" - [ -n "$duid" ] && printf "ff%08x%s" "$iaid" "$duid" + network_generate_iface_iaid iaid "$iface" + duid="$(uci_get network @globals[0] dhcp_default_duid)" + [ -n "$duid" ] && printf "ff%s%s" "$iaid" "$duid" } proto_dhcp_setup() {