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>
This commit is contained in:
parent
7ec1a51e8a
commit
ea0e29150e
|
@ -27,7 +27,7 @@ exec 0<&9 9<&-
|
||||||
|
|
||||||
test $nfsroot -eq 0 && exit 0
|
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/'`
|
nfs_iface=`ip route get $nfs_addr | grep dev | sed -e 's/^.*dev \([-a-z0-9.]*\).*$/\1/'`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ HOMEPAGE = "http://packages.debian.org/netbase"
|
||||||
SECTION = "base"
|
SECTION = "base"
|
||||||
LICENSE = "GPLv2"
|
LICENSE = "GPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
|
LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
|
||||||
PR = "r0"
|
PR = "r1"
|
||||||
|
|
||||||
inherit update-rc.d
|
inherit update-rc.d
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue