summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-08-30 23:34:22 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-02 12:52:11 (GMT)
commitc6fda196cbbfd749b8bf10ad97dc373217d8ed2e (patch)
tree7ca0bd8c79c9584b1b71714d14dce3eba30f86dc /meta/recipes-connectivity
parent60e503a4e5f37e9adf70f09323cdfa36ad439ffc (diff)
downloadpoky-c6fda196cbbfd749b8bf10ad97dc373217d8ed2e.tar.gz
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>
Diffstat (limited to 'meta/recipes-connectivity')
-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 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 \
20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \ 20 ${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
21 " 21 "
22 22
23INC_PR = "r15" 23INC_PR = "r16"
24 24
25TIST = "--enable-tist" 25TIST = "--enable-tist"
26TIST_powerpc = "" 26TIST_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
28 28
29do_start() { 29do_start() {
30 EXTRA_PARAM="" 30 EXTRA_PARAM=""
31 if test $nfsroot -eq 1 ; then 31 if test $nfsroot -eq 0 ; then
32 EXTRA_PARAM="-P ethernet" 32 $DAEMON $EXTRA_PARAM
33 fi 33 fi
34 $DAEMON $EXTRA_PARAM
35} 34}
36 35
37do_stop() { 36do_stop() {