summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoy.Li <rongqing.li@windriver.com>2012-07-24 09:23:19 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-26 14:40:49 +0100
commit2ccbf35ed1de1e0c1a412d6366c1b1f7fe12c23a (patch)
treee15013049552cc157158ad9b6c9a8039d3a6303c /meta/recipes-core
parent1a4a077fac78afc034c60ca2677ea9a4ea278d5d (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-core/busybox/busybox_1.19.4.bb2
-rw-r--r--meta/recipes-core/busybox/files/simple.script3
2 files changed, 3 insertions, 2 deletions
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 @@
1require busybox.inc 1require busybox.inc
2PR = "r10" 2PR = "r11"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://B921600.patch \ 5 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"
10 10
11# return 0 if root is mounted on a network filesystem 11# return 0 if root is mounted on a network filesystem
12root_is_nfs() { 12root_is_nfs() {
13 grep -qe '^/dev/root.*\(nfs\|smbfs\|ncp\|coda\) .*' /proc/mounts 13 sed -n 's/^[^ ]* \([^ ]*\) \([^ ]*\) .*$/\1 \2/p' /proc/mounts |
14 grep -q "^/ \(nfs\|smbfs\|ncp\|coda\)$"
14} 15}
15 16
16have_bin_ip=0 17have_bin_ip=0