From 2ccbf35ed1de1e0c1a412d6366c1b1f7fe12c23a Mon Sep 17 00:00:00 2001 From: "Roy.Li" Date: Tue, 24 Jul 2012 09:23:19 +0800 Subject: busybox:udhcpc: fix the root_is_nfs() function [YOCTO #2788] The system will be hung when udhcpc starts, if nfs is mounted at "/" directory and default route is different after starting udhcpc. The cause is that root_is_nfs() does not work after kernel-2.6.37, since the device name has been changed from /dev/root to ${IPADDR}:${NFSDIR} on /proc/mounts. which leads to remove the default routes to nfs server, Now we use a loose match to check if rootfs is nfs. (From OE-Core rev: 9921cb0104ea36daf909c110bb6767e5fd307da0) Signed-off-by: Roy.Li Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/busybox/busybox_1.19.4.bb | 2 +- meta/recipes-core/busybox/files/simple.script | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/busybox') diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb index cc97e2a853..7bdfbda538 100644 --- a/meta/recipes-core/busybox/busybox_1.19.4.bb +++ b/meta/recipes-core/busybox/busybox_1.19.4.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r10" +PR = "r11" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://B921600.patch \ diff --git a/meta/recipes-core/busybox/files/simple.script b/meta/recipes-core/busybox/files/simple.script index 27368f0ee5..69739850d8 100644 --- a/meta/recipes-core/busybox/files/simple.script +++ b/meta/recipes-core/busybox/files/simple.script @@ -10,7 +10,8 @@ RESOLV_CONF="/etc/resolv.conf" # return 0 if root is mounted on a network filesystem root_is_nfs() { - grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts + sed -n 's/^[^ ]* \([^ ]*\) \([^ ]*\) .*$/\1 \2/p' /proc/mounts | + grep -q "^/ \(nfs\|smbfs\|ncp\|coda\)$" } have_bin_ip=0 -- cgit v1.2.3-54-g00ecf