[oe-commits] Jukka Rissanen : connman: Ignore the NFS root network interface in init script

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 31a62e9b0125db3444ce381f85679cc541377a00
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=31a62e9b0125db3444ce381f85679cc541377a00

Author: Jukka Rissanen <jukka.rissanen at linux.intel.com>
Date:   Fri Sep  6 10:23:00 2013 +0300

connman: Ignore the NFS root network interface in init script

The connman init.d script tried to ignore all the network interfaces
if NFS root is configured. We should only ignore the interface
that is used by NFS root.

[YOCTO #4587]

Signed-off-by: Jukka Rissanen <jukka.rissanen at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-connectivity/connman/connman/connman |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-connectivity/connman/connman/connman b/meta/recipes-connectivity/connman/connman/connman
index 67ba7c8..2625ade 100644
--- a/meta/recipes-connectivity/connman/connman/connman
+++ b/meta/recipes-connectivity/connman/connman/connman
@@ -29,8 +29,18 @@ done
 do_start() {
 	EXTRA_PARAM=""
 	if test $nfsroot -eq 1 ; then
-		ethn=`ifconfig | grep eth | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"`
-		EXTRA_PARAM="-I $ethn"
+	    NET_DEVS=`cat /proc/net/dev | sed -ne 's/^\([a-zA-Z0-9 ]*\):.*$/\1/p'`
+	    NET_ADDR=`cat /proc/cmdline | sed -ne 's/^.*ip=\([^ ]*\):.*$/\1/p'`
+
+	    if [ x$NET_ADDR != x ]; then
+		for i in $NET_DEVS; do
+		    ADDR=`ifconfig $i | sed 's/addr://g' | sed -ne 's/^.*inet \([0-9.]*\) .*$/\1/p'`
+		    if [ "$NET_ADDR" = "$ADDR" ]; then
+			EXTRA_PARAM="-I $i"
+			break
+		    fi
+		done
+	    fi
 	fi
 	if [ -f @LIBDIR@/connman/wired-setup ] ; then
 		. @LIBDIR@/connman/wired-setup