From 5d4d8dd2b64a8fe163dd0803f323ab6e9643acee Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Wed, 20 Jul 2016 23:39:17 +0200 Subject: netifd: Remove hardcoded DHCP release option Remove the udhcpc -R release option as sending a DHCP release is configurable via the uci option release. Signed-off-by: Hans Dedecker --- package/network/config/netifd/files/lib/netifd/proto/dhcp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/network/config') 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 7f4af25329..7085bd2aa6 100755 --- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh +++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh @@ -54,7 +54,7 @@ proto_dhcp_setup() { proto_run_command "$config" udhcpc \ -p /var/run/udhcpc-$iface.pid \ -s /lib/netifd/dhcp.script \ - -f -R -t 0 -i "$iface" \ + -f -t 0 -i "$iface" \ ${ipaddr:+-r $ipaddr} \ ${hostname:+-H $hostname} \ ${vendorid:+-V $vendorid} \ -- cgit v1.2.3 From ea3d5f4d869f5bb7343fd07864f41e63105d011f Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Wed, 20 Jul 2016 23:40:11 +0200 Subject: netifd: quote vendorid and hostname variables in dhcp script Quote hostname and vendorid variables in dhcp script so they can hold strings having white spaces Signed-off-by: Hans Dedecker --- package/network/config/netifd/files/lib/netifd/proto/dhcp.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/network/config') 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 7085bd2aa6..abfdaaffdd 100755 --- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh +++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh @@ -56,8 +56,8 @@ proto_dhcp_setup() { -s /lib/netifd/dhcp.script \ -f -t 0 -i "$iface" \ ${ipaddr:+-r $ipaddr} \ - ${hostname:+-H $hostname} \ - ${vendorid:+-V $vendorid} \ + ${hostname:+-H "$hostname"} \ + ${vendorid:+-V "$vendorid"} \ $clientid $broadcast $release $dhcpopts } -- cgit v1.2.3 From 9afe0c1ec5fa00a1cbdc57ffe23732bf6bc437e6 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 20 Jul 2016 23:41:12 +0200 Subject: netifd: update to the latest version Signed-off-by: Felix Fietkau --- package/network/config/netifd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/network/config') diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index 514eedd885..82fcb3e48e 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netifd -PKG_VERSION:=2016-03-31 +PKG_VERSION:=2016-06-06 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(OPENWRT_GIT)/project/netifd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=39d9ceeb96162a83a3f5fa63e6aaa1ccb38caa62 +PKG_SOURCE_VERSION:=99e6dc68bbac5a57a0ebca810a9dc36e38667821 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MAINTAINER:=Felix Fietkau # PKG_MIRROR_MD5SUM:= -- cgit v1.2.3