From: Steven Barth <cyrus@openwrt.org>
Date: Thu, 17 Oct 2013 12:55:40 +0000 (+0000)
Subject: Added 'customopts' dhcp protocol option, which is an array passed along to udhcpc... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c759b49a4ff8da29d40dd996528ed50807eda438;p=openwrt%2Fstaging%2Fjow.git

Added 'customopts' dhcp protocol option, which is an array passed along to udhcpc as series of -x options.

Signed-off-by: Markus Stenberg <markus.stenberg@iki.fi>

SVN-Revision: 38436
---

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 a270c681d7..1e0aa68881 100755
--- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
+++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
@@ -13,20 +13,25 @@ proto_dhcp_init_config() {
 	proto_config_add_boolean "broadcast"
 	proto_config_add_string "reqopts"
 	proto_config_add_string "iface6rd"
+	proto_config_add_string "customopts"
 }
 
 proto_dhcp_setup() {
 	local config="$1"
 	local iface="$2"
 
-	local ipaddr hostname clientid vendorid broadcast reqopts iface6rd
-	json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd
+	local ipaddr hostname clientid vendorid broadcast reqopts iface6rd customopts
+	json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd customopts
 
 	local opt dhcpopts
 	for opt in $reqopts; do
 		append dhcpopts "-O $opt"
 	done
 
+	for opt in $customopts; do
+		append dhcpopts "-x $opt"
+	done
+
 	[ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
 	[ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
 	[ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd"