aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-08-30 16:34:22 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-02 05:47:39 -0700
commitd27692e9421206177fd572a79298f5988607ce21 (patch)
treebcf49846c8455bacc2c8eac8f9948eea9f119a2c /meta
parentd6614b0ac7c83b2e17e68903a85fc8374e936c1a (diff)
downloadopenembedded-core-contrib-d27692e9421206177fd572a79298f5988607ce21.tar.gz
openembedded-core-contrib-d27692e9421206177fd572a79298f5988607ce21.tar.bz2
openembedded-core-contrib-d27692e9421206177fd572a79298f5988607ce21.zip
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/connman/connman.inc2
-rw-r--r--meta/recipes-connectivity/connman/connman/connman5
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() {