From 4f8c1b29e22049d76a83c32b00365604d368952e Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 20 Mar 2019 13:39:37 +0800 Subject: [PATCH] netifd:fix delegate config update on reload --- package/network/config/netifd/Makefile | 6 +++--- .../network/config/netifd/files/lib/netifd/proto/dhcp.sh | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 66f0e49a3..2bfe6d5a0 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git -PKG_SOURCE_DATE:=2018-12-16 -PKG_SOURCE_VERSION:=2750ce2e0a9177e024823332853c76dbd0937c98 -PKG_MIRROR_HASH:=08b278e3ebc13703a508a892625bdc77d377563752cd9dcfa2f3f30f7f737775 +PKG_SOURCE_DATE:=2019-03-14 +PKG_SOURCE_VERSION:=81ac3bce0157f96fbc31cf6e965eecb170e48c88 +PKG_MIRROR_HASH:=d6a8dc022068b8fef1233061d1fb0521423b3525220e63ded138c3499e193af9 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 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 a2b0ccedb..0d06eba06 100755 --- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh +++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh @@ -46,6 +46,8 @@ proto_dhcp_setup() { json_for_each_item proto_dhcp_add_sendopts sendopts dhcpopts [ -z "$hostname" ] && hostname="$(cat /proc/sys/kernel/hostname)" + [ "$hostname" = "*" ] && hostname= + [ "$defaultreqopts" = 0 ] && defaultreqopts="-o" || defaultreqopts= [ "$broadcast" = 1 ] && broadcast="-B" || broadcast= [ "$release" = 1 ] && release="-R" || release=