summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/netbase
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-04-29 10:33:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-04 00:49:51 +0100
commitfa4f6d1d01a3ce9fbc6f479f65138f1af7369714 (patch)
treeb38482a68b4b7060935504c60ad95d4534d354a7 /meta/recipes-core/netbase
parent168d94be0e28fcbefda9df07d6d1b0cfd96e75fc (diff)
downloadopenembedded-core-fa4f6d1d01a3ce9fbc6f479f65138f1af7369714.tar.gz
openembedded-core-fa4f6d1d01a3ce9fbc6f479f65138f1af7369714.tar.bz2
openembedded-core-fa4f6d1d01a3ce9fbc6f479f65138f1af7369714.zip
netbase: fix check for nfsroot in if-pre-up.d script
The if-pre-up.d/nfsroot script was no longer functioning correctly due to a change in iproute2's installation of the "ip" executable. The script will now function correctly regardless of whether ip is in /bin or /sbin. Fixes [YOCTO #1006]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/netbase')
-rw-r--r--meta/recipes-core/netbase/netbase-4.45/nfsroot2
-rw-r--r--meta/recipes-core/netbase/netbase_4.45.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/netbase/netbase-4.45/nfsroot b/meta/recipes-core/netbase/netbase-4.45/nfsroot
index fc384a8ea5..750c0a98f9 100644
--- a/meta/recipes-core/netbase/netbase-4.45/nfsroot
+++ b/meta/recipes-core/netbase/netbase-4.45/nfsroot
@@ -27,7 +27,7 @@ exec 0<&9 9<&-
test $nfsroot -eq 0 && exit 0
-if test -x /sbin/ip ; then
+if [ -x /bin/ip -o -x /sbin/ip ] ; then
nfs_iface=`ip route get $nfs_addr | grep dev | sed -e 's/^.*dev \([-a-z0-9.]*\).*$/\1/'`
fi
diff --git a/meta/recipes-core/netbase/netbase_4.45.bb b/meta/recipes-core/netbase/netbase_4.45.bb
index 68cde857ec..319afa7bd2 100644
--- a/meta/recipes-core/netbase/netbase_4.45.bb
+++ b/meta/recipes-core/netbase/netbase_4.45.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://packages.debian.org/netbase"
SECTION = "base"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
-PR = "r0"
+PR = "r1"
inherit update-rc.d