[oe-commits] yadi.hu at windriver.com : BusyBox: Fixing broadcast address is not fed and rightly initialized

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 666c6a126cd12d2555361f5b573b6a26437df780
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=666c6a126cd12d2555361f5b573b6a26437df780

Author: yadi.hu at windriver.com <yadi.hu at windriver.com>
Date:   Fri Oct 24 08:33:27 2014 +0800

BusyBox: Fixing broadcast address is not fed and rightly initialized

When using udhcpc along with ip command(/sbin/ip), broadcast address is not
assigned. Broadcast address is successfully assigned when using udhcpc without
ip command existence.

with ip command:
    $ifconfig eth0|grep Bcast
          inet addr:128.224.162.141  Bcast:0.0.0.0  Mask:255.255.254.0
    $
without ip command:
    $ifconfig eth0|grep Bcast
          inet addr:128.224.162.141  Bcast:128.224.163.255  Mask:255.255.254.0
    $

/etc/udhcp.d/50default[simple.script] is called to set ip address by dhcp
client, In case of ifconfig, it doesn't care of it's existence because it
will automatically calculate broadcast address then assign it if there is
no broadcast option. However in case of ip command, it requires broadcast
address statically.

Signed-off-by: Hu <yadi.hu at windriver.com>
Signed-off-by: Roy Li <rongqing.li at windriver.com>

---

 meta/recipes-core/busybox/files/simple.script | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/busybox/files/simple.script b/meta/recipes-core/busybox/files/simple.script
index 78ac424..757e487 100644
--- a/meta/recipes-core/busybox/files/simple.script
+++ b/meta/recipes-core/busybox/files/simple.script
@@ -5,7 +5,6 @@
 [ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
 
 RESOLV_CONF="/etc/resolv.conf"
-[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
 [ -n "$subnet" ] && NETMASK="netmask $subnet"
 
 # return 0 if root is mounted on a network filesystem
@@ -17,8 +16,11 @@ root_is_nfs() {
 have_bin_ip=0
 if [ -x /sbin/ip ]; then
   have_bin_ip=1
+  BROADCAST="broadcast +"
 fi
 
+[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
+
 case "$1" in
 	deconfig)
 		if [ -x /sbin/resolvconf ]; then