diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-04-29 10:33:32 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-04 00:54:38 +0100 |
| commit | ea0e29150edb03d785dfca63f220b00d10c6e22e (patch) | |
| tree | 9fb0288f549cd36e77d722ed5497ba63d290f4bb /meta/recipes-core/netbase | |
| parent | 7ec1a51e8ac266632465c34304a2d6f95f9e94cf (diff) | |
| download | openembedded-core-contrib-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/nfsroot | 2 | ||||
| -rw-r--r-- | meta/recipes-core/netbase/netbase_4.45.bb | 2 |
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 |