summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/netbase
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-04-29 09:33:32 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-03 23:54:38 (GMT)
commitea0e29150edb03d785dfca63f220b00d10c6e22e (patch)
tree9fb0288f549cd36e77d722ed5497ba63d290f4bb /meta/recipes-core/netbase
parent7ec1a51e8ac266632465c34304a2d6f95f9e94cf (diff)
downloadpoky-ea0e29150edb03d785dfca63f220b00d10c6e22e.tar.gz
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]. (From OE-Core rev: fa4f6d1d01a3ce9fbc6f479f65138f1af7369714) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 fc384a8..750c0a9 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<&-
27 27
28test $nfsroot -eq 0 && exit 0 28test $nfsroot -eq 0 && exit 0
29 29
30if test -x /sbin/ip ; then 30if [ -x /bin/ip -o -x /sbin/ip ] ; then
31 nfs_iface=`ip route get $nfs_addr | grep dev | sed -e 's/^.*dev \([-a-z0-9.]*\).*$/\1/'` 31 nfs_iface=`ip route get $nfs_addr | grep dev | sed -e 's/^.*dev \([-a-z0-9.]*\).*$/\1/'`
32fi 32fi
33 33
diff --git a/meta/recipes-core/netbase/netbase_4.45.bb b/meta/recipes-core/netbase/netbase_4.45.bb
index 68cde85..319afa7 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"
4SECTION = "base" 4SECTION = "base"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab" 6LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
7PR = "r0" 7PR = "r1"
8 8
9inherit update-rc.d 9inherit update-rc.d
10 10