connman: Don't start connmand when booting using nfsroot

There was a change to connman, such that it cleans up the
route table for devices at startup, this was causing the
network to get lost and NFS to loose it connection.

[YOCTO #3008]

(From OE-Core rev: d27692e9421206177fd572a79298f5988607ce21)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 3 insertions, 4 deletions

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 653d1dfa84..0f96202097 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -20,7 +20,7 @@ DEPENDS  = "dbus glib-2.0 ppp iptables gnutls \
             ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
             "
 
-INC_PR = "r15"
+INC_PR = "r16"
 
 TIST = "--enable-tist"
 TIST_powerpc = ""
diff --git a/meta/recipes-connectivity/connman/connman/connman b/meta/recipes-connectivity/connman/connman/connman
index f01bf371c2..4a0017fc18 100644
--- a/meta/recipes-connectivity/connman/connman/connman
+++ b/meta/recipes-connectivity/connman/connman/connman
@@ -28,10 +28,9 @@ done
 
 do_start() {
         EXTRA_PARAM=""
-        if test $nfsroot -eq 1 ; then
-                EXTRA_PARAM="-P ethernet"
+        if test $nfsroot -eq 0 ; then
+                $DAEMON $EXTRA_PARAM
         fi
-        $DAEMON $EXTRA_PARAM
 }
 
 do_stop() {