Patchwork [v2] connman: Don't start connmand when booting using nfsroot

login
register
mail settings
Submitter Saul Wold
Date Aug. 31, 2012, 9:39 p.m.
Message ID <1346449191-22541-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/35615/
State Accepted
Commit d27692e9421206177fd572a79298f5988607ce21
Headers show

Comments

Saul Wold - Aug. 31, 2012, 9:39 p.m.
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>
---
 meta/recipes-connectivity/connman/connman.inc     |    2 +-
 meta/recipes-connectivity/connman/connman/connman |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

Patch

diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 653d1df..0f96202 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 f01bf37..4a0017f 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() {