[oe-commits] Roy.Li : busybox:udhcpc: fix the root_is_nfs() function
git at git.openembedded.org
git at git.openembedded.org
Thu Jul 26 13:43:33 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 9921cb0104ea36daf909c110bb6767e5fd307da0
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9921cb0104ea36daf909c110bb6767e5fd307da0
Author: Roy.Li <rongqing.li at windriver.com>
Date: Tue Jul 24 09:23:19 2012 +0800
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.
Signed-off-by: Roy.Li <rongqing.li at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
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(-)
diff --git a/meta/recipes-core/busybox/busybox_1.19.4.bb b/meta/recipes-core/busybox/busybox_1.19.4.bb
index cc97e2a..7bdfbda 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 27368f0..6973985 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
More information about the Openembedded-commits
mailing list