From ce1c587eec23f03b5e930e86cf37e454a2f99508 Mon Sep 17 00:00:00 2001 From: cyrus Date: Thu, 17 Oct 2013 12:55:40 +0000 Subject: [PATCH] Added 'customopts' dhcp protocol option, which is an array passed along to udhcpc as series of -x options. Signed-off-by: Markus Stenberg git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38436 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/config/netifd/files/lib/netifd/proto/dhcp.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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" -- 2.11.0