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@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-connectivity/connman/connman/connman b/meta/recipes-connectivity/connman/connman/connman
index 67ba7c8a2a3dcb924ea8b2d02bb97bd5074fa46d..2625adeead8647a7333aee0c807b5b9384421803 100644 (file)
--- 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