summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/connman
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2010-10-11 07:48:03 (GMT)
committerRichard Purdie <rpurdie@linux.intel.com>2010-10-11 11:22:39 (GMT)
commit771fb55d6b13a92e1b30fbc95fdb1c34ddec7ebe (patch)
treebb56ac6af6569bf2d220c882bc6f460b81c205e6 /meta/recipes-connectivity/connman
parentded2919f1929e31f0ebebbde6d273d3aaeed8325 (diff)
downloadpoky-771fb55d6b13a92e1b30fbc95fdb1c34ddec7ebe.tar.gz
connman: Do not take over ethernet interface if target is boot by nfs
Detect if target system is booting by nfs, connman will not take over the ethernet interface. This fixes [BUGID #364] Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/connman')
-rwxr-xr-xmeta/recipes-connectivity/connman/connman-0.56/connman22
-rw-r--r--meta/recipes-connectivity/connman/connman_0.56.bb2
2 files changed, 22 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/connman/connman-0.56/connman b/meta/recipes-connectivity/connman/connman-0.56/connman
index f8154f6..f01bf37 100755
--- a/meta/recipes-connectivity/connman/connman-0.56/connman
+++ b/meta/recipes-connectivity/connman/connman-0.56/connman
@@ -10,8 +10,28 @@ fi
10 10
11set -e 11set -e
12 12
13nfsroot=0
14
15exec 9<&0 < /proc/mounts
16while read dev mtpt fstype rest; do
17 if test $mtpt = "/" ; then
18 case $fstype in
19 nfs | nfs4)
20 nfsroot=1
21 break
22 ;;
23 *)
24 ;;
25 esac
26 fi
27done
28
13do_start() { 29do_start() {
14 $DAEMON 30 EXTRA_PARAM=""
31 if test $nfsroot -eq 1 ; then
32 EXTRA_PARAM="-P ethernet"
33 fi
34 $DAEMON $EXTRA_PARAM
15} 35}
16 36
17do_stop() { 37do_stop() {
diff --git a/meta/recipes-connectivity/connman/connman_0.56.bb b/meta/recipes-connectivity/connman/connman_0.56.bb
index 69dad66..665da32 100644
--- a/meta/recipes-connectivity/connman/connman_0.56.bb
+++ b/meta/recipes-connectivity/connman/connman_0.56.bb
@@ -1,5 +1,5 @@
1require connman.inc 1require connman.inc
2PR = "r1" 2PR = "r2"
3 3
4EXTRA_OECONF += "\ 4EXTRA_OECONF += "\
5 ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \ 5 ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant \