From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 22 Dec 2010 07:20:24 +0000 (+0000)
Subject: base-files: implement "reqopts" parameter for dhcp interfaces to specify additional... 
X-Git-Tag: reboot~17985
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3b6851aa82f8187725de365a7103416dd434c25b;p=openwrt%2Fstaging%2Fchunkeey.git

base-files: implement "reqopts" parameter for dhcp interfaces to specify additional dhcp options to request

SVN-Revision: 24780
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index d14be14529..01058ba871 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=63
+PKG_RELEASE:=64
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 2ef8cda9d9..449d252abd 100755
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -347,7 +347,7 @@ setup_interface() {
 			local pidfile="/var/run/dhcp-${iface}.pid"
 			service_kill udhcpc "$pidfile"
 
-			local ipaddr netmask hostname proto1 clientid vendorid broadcast
+			local ipaddr netmask hostname proto1 clientid vendorid broadcast reqopts
 			config_get ipaddr "$config" ipaddr
 			config_get netmask "$config" netmask
 			config_get hostname "$config" hostname
@@ -355,6 +355,7 @@ setup_interface() {
 			config_get clientid "$config" clientid
 			config_get vendorid "$config" vendorid
 			config_get_bool broadcast "$config" broadcast 0
+			config_get reqopts "$config" reqopts
 
 			[ -z "$ipaddr" ] || \
 				$DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
@@ -370,6 +371,7 @@ setup_interface() {
 				${clientid:+-c $clientid} \
 				${vendorid:+-V $vendorid} \
 				-b -p "$pidfile" $broadcast \
+				${reqopts:+-O $reqopts} \
 				${dhcpopts:- -O rootpath -R &}
 		;;
 		none)