hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[package] base-files: fix handling of dhcp "reqopts" option 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25237 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Jo-Philipp Wich 2011-01-29 13:45:16 +00:00
parent 72807409a2
commit 80f819f8a0
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/base-files/files/lib/network/config.sh
View File

@ -360,9 +360,14 @@ setup_interface() {
[ -z "$ipaddr" ] || \ [ -z "$ipaddr" ] || \
$DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"} $DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
# additional request options
local opt dhcpopts
for opt in $reqopts; do
append dhcpopts -O "$opt"
done
# don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp) # don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp)
local dhcpopts [ "$proto1" != "$proto" ] && append dhcpopts "-n -q" || append dhcpopts "-O rootpath -R &"
[ ."$proto1" != ."$proto" ] && dhcpopts="-n -q"
[ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast= [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast=
$DEBUG eval udhcpc -t 0 -i "$iface" \ $DEBUG eval udhcpc -t 0 -i "$iface" \
@ -371,8 +376,7 @@ setup_interface() {
${clientid:+-c $clientid} \ ${clientid:+-c $clientid} \
${vendorid:+-V $vendorid} \ ${vendorid:+-V $vendorid} \
-b -p "$pidfile" $broadcast \ -b -p "$pidfile" $broadcast \
${reqopts:+-O $reqopts} \ ${dhcpopts}
${dhcpopts:- -O rootpath -R &}
;; ;;
none) none)
setup_interface_none "$iface" "$config" setup_interface_none "$iface" "$config"