netbase: fix check for nfsroot in if-pre-up.d script

From: Paul Eggleton <[email protected]>

Adding "auto eth0" to our default IP configuration caused failure to boot NFS root systems [1]; netbase's if-pre-up.d/nfsroot script was supposed to stop this but failed to do so due to looking for /sbin/ip when we actually now install /bin/ip. This patch checks for either installed executable.

[1] http://bugzilla.pokylinux.org/show_bug.cgi?id=1006

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: paule/nfsroot-ifup
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/nfsroot-ifup

Thanks,
Paul Eggleton <[email protected]>
---

Paul Eggleton (1):
netbase: fix check for nfsroot in if-pre-up.d script

 meta/recipes-core/netbase/netbase-4.45/nfsroot |    2 +-
 meta/recipes-core/netbase/netbase_4.45.bb      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

From: Paul Eggleton <[email protected]>

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].

---
 meta/recipes-core/netbase/netbase-4.45/nfsroot |    2 +-
 meta/recipes-core/netbase/netbase_4.45.bb      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

index fc384a8..750c0a9 100644
@@ -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
 

index 68cde85..319afa7 100644
@@ -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
 

1.7.1