| Submitter | rongqing.li@windriver.com |
|---|---|
| Date | July 22, 2012, 12:46 a.m. |
| Message ID | <1342917963-2253-1-git-send-email-rongqing.li@windriver.com> |
| Download | mbox | patch |
| Permalink | /patch/32793/ |
| State | New |
| Headers | show |
Comments
On 07/21/2012 05:46 PM, rongqing.li@windriver.com wrote: > From: Roy.Li <rongqing.li@windriver.com> > > [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@windriver.com> > --- > meta/recipes-core/busybox/files/simple.script | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > This need a PR bump in the busybox recipe. Sau! > diff --git a/meta/recipes-core/busybox/files/simple.script b/meta/recipes-core/busybox/files/simple.script > index 27368f0..dc2121d 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 >
Patch
diff --git a/meta/recipes-core/busybox/files/simple.script b/meta/recipes-core/busybox/files/simple.script index 27368f0..dc2121d 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