diff options
author | Roy.Li <rongqing.li@windriver.com> | 2012-07-24 09:23:19 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-26 14:40:49 +0100 |
commit | 2ccbf35ed1de1e0c1a412d6366c1b1f7fe12c23a (patch) | |
tree | e15013049552cc157158ad9b6c9a8039d3a6303c /meta/recipes-core/busybox/files | |
parent | 1a4a077fac78afc034c60ca2677ea9a4ea278d5d (diff) | |
download | openembedded-core-contrib-2ccbf35ed1de1e0c1a412d6366c1b1f7fe12c23a.tar.gz |
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 <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox/files')
-rw-r--r-- | meta/recipes-core/busybox/files/simple.script | 3 |
1 files changed, 2 insertions, 1 deletions
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 |