summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryadi.hu@windriver.com <yadi.hu@windriver.com>2014-10-24 08:33:27 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-31 10:17:07 +0000
commit479baa37ba366f5371fbc35d95d39e27f9b14cd2 (patch)
tree60d7efe0f8baef1b0885e60802c3f6a165a3ff63
parent7799b884f57642a48f9ed9a829a176d83b474516 (diff)
downloadopenembedded-core-479baa37ba366f5371fbc35d95d39e27f9b14cd2.tar.gz
openembedded-core-479baa37ba366f5371fbc35d95d39e27f9b14cd2.tar.bz2
openembedded-core-479baa37ba366f5371fbc35d95d39e27f9b14cd2.zip
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. (From OE-Core rev: 666c6a126cd12d2555361f5b573b6a26437df780) Signed-off-by: Hu <yadi.hu@windriver.com> Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta/recipes-core/busybox/files/simple.script4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-core/busybox/files/simple.script b/meta/recipes-core/busybox/files/simple.script
index 78ac4242a8..757e487b97 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