From: Saul Wold <sgw@linux.intel.com>
Date: Thu, 30 Aug 2012 23:34:22 +0000 (-0700)
Subject: connman: Don't start connmand when booting using nfsroot
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~40187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d27692e9421206177fd572a79298f5988607ce21;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 653d1dfa847..0f96202097f 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 f01bf371c2a..4a0017fc181 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() {