From 7e8ca6fb182d5a04bec9adcafc2c108c50c1955f Mon Sep 17 00:00:00 2001 From: "yadi.hu@windriver.com" Date: Fri, 24 Oct 2014 08:33:27 +0800 Subject: 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 Signed-off-by: Roy Li Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/files/simple.script | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/recipes-core/busybox/files') 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 -- cgit v1.2.3-54-g00ecf