summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJukka Rissanen <jukka.rissanen@linux.intel.com>2013-09-06 10:23:00 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-06 23:04:49 +0100
commitc73487302270a7c2d3bbbb191ce1dd63ee2016dc (patch)
tree692442cad8ee8e7b1df86f06c9a1efbec4e92b2e
parent12223c038c7cc82d352b542f715c27ad330e87f2 (diff)
downloadpoky-c73487302270a7c2d3bbbb191ce1dd63ee2016dc.tar.gz
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] (From OE-Core rev: 1838671b832015ae28c8c101e8b20afbbf4b3c98) Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/connman/connman/connman14
1 files changed, 12 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/connman/connman/connman b/meta/recipes-connectivity/connman/connman/connman
index 67ba7c8a2a..2625adeead 100644
--- a/meta/recipes-connectivity/connman/connman/connman
+++ b/meta/recipes-connectivity/connman/connman/connman
@@ -29,8 +29,18 @@ done
29do_start() { 29do_start() {
30 EXTRA_PARAM="" 30 EXTRA_PARAM=""
31 if test $nfsroot -eq 1 ; then 31 if test $nfsroot -eq 1 ; then
32 ethn=`ifconfig | grep eth | sed -e "s/\(eth[0-9]\)\(.*\)/\1/"` 32 NET_DEVS=`cat /proc/net/dev | sed -ne 's/^\([a-zA-Z0-9 ]*\):.*$/\1/p'`
33 EXTRA_PARAM="-I $ethn" 33 NET_ADDR=`cat /proc/cmdline | sed -ne 's/^.*ip=\([^ ]*\):.*$/\1/p'`
34
35 if [ x$NET_ADDR != x ]; then
36 for i in $NET_DEVS; do
37 ADDR=`ifconfig $i | sed 's/addr://g' | sed -ne 's/^.*inet \([0-9.]*\) .*$/\1/p'`
38 if [ "$NET_ADDR" = "$ADDR" ]; then
39 EXTRA_PARAM="-I $i"
40 break
41 fi
42 done
43 fi
34 fi 44 fi
35 if [ -f @LIBDIR@/connman/wired-setup ] ; then 45 if [ -f @LIBDIR@/connman/wired-setup ] ; then
36 . @LIBDIR@/connman/wired-setup 46 . @LIBDIR@/connman/wired-setup