From: Jo-Philipp Wich Date: Wed, 2 Jun 2010 20:21:41 +0000 (+0000) Subject: base-files: introduce option "broadcast" for proto=dhcp interface to enable the broad... X-Git-Tag: reboot~19738 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=93c2c81bcf175271d18e28b7266e8b2c65e31e8f;p=openwrt%2Fstaging%2Flynxis.git base-files: introduce option "broadcast" for proto=dhcp interface to enable the broadcast flag in DHCP requests, required by certain providers SVN-Revision: 21661 --- diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh index 1736f8e7cc..8321b191bf 100755 --- a/package/base-files/files/lib/network/config.sh +++ b/package/base-files/files/lib/network/config.sh @@ -348,12 +348,13 @@ setup_interface() { if [ -d "/proc/$pid" ] && grep -qs udhcpc "/proc/${pid}/cmdline"; then lock -u "$lockfile" else - local ipaddr netmask hostname proto1 clientid + local ipaddr netmask hostname proto1 clientid broadcast config_get ipaddr "$config" ipaddr config_get netmask "$config" netmask config_get hostname "$config" hostname config_get proto1 "$config" proto config_get clientid "$config" clientid + config_get_bool broadcast "$config" broadcast 0 [ -z "$ipaddr" ] || \ $DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"} @@ -361,7 +362,15 @@ setup_interface() { # 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" ] && dhcpopts="-n -q" - $DEBUG eval udhcpc -t 0 -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} ${clientid:+-c $clientid} -b -p "$pidfile" ${dhcpopts:- -O rootpath -R &} + [ "$broadcast" = 1 ] && broadcast="-O broadcast" || broadcast= + + $DEBUG eval udhcpc -t 0 -i "$iface" \ + ${ipaddr:+-r $ipaddr} \ + ${hostname:+-H $hostname} \ + ${clientid:+-c $clientid} \ + -b -p "$pidfile" $broadcast \ + ${dhcpopts:- -O rootpath -R &} + lock -u "$lockfile" fi ;;