[prev in list] [next in list] [prev in thread] [next in thread]
List: openembedded-core
Subject: [OE-core] [PATCH 1/1] netbase: fix check for nfsroot in if-pre-up.d script
From: paul.eggleton () linux ! intel ! com (Paul Eggleton)
Date: 2011-04-29 10:02:15
Message-ID: 5034751978f76c713d2ece1118a6a7e9fd14e5e3.1304069968.git.paul.eggleton () linux ! intel ! com
[Download RAW message or body]
From: Paul Eggleton <paul.eggleton at linux.intel.com>
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 at linux.intel.com>
---
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(-)
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<&-
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 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"
SECTION = "base"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
-PR = "r0"
+PR = "r1"
inherit update-rc.d
--
1.7.1
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic