aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephane Desneux <stephane.desneux@iot.bzh>2016-04-15 11:48:35 +0000
committerStephane Desneux <stephane.desneux@iot.bzh>2016-04-15 11:48:35 +0000
commita76b5c863e705ed2dc52b347d64e616bab349133 (patch)
tree9644783d26f613388eb9ec7cb63c995fb6b25a78
parentc407a33fe8d808e4c1c6a15a524de179e658c696 (diff)
Disable connman when booting over NFS
This is a quick workaround to avoid connman to bring the boot interface down then up during network boot. Bug-AGL: SPEC-171 Change-Id: I0b98bbdc5f727979e919f04f836af988a6c3974e Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
-rw-r--r--meta-agl/recipes-connectivity/connman/connman_%.bbappend3
-rw-r--r--meta-agl/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch11
2 files changed, 14 insertions, 0 deletions
diff --git a/meta-agl/recipes-connectivity/connman/connman_%.bbappend b/meta-agl/recipes-connectivity/connman/connman_%.bbappend
new file mode 100644
index 000000000..e41cbe954
--- /dev/null
+++ b/meta-agl/recipes-connectivity/connman/connman_%.bbappend
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://0001-disable-when-booting-over-nfs.patch"
diff --git a/meta-agl/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch b/meta-agl/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch
new file mode 100644
index 000000000..a95bc5a34
--- /dev/null
+++ b/meta-agl/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch
@@ -0,0 +1,11 @@
+diff -urN a/src/connman.service.in b/src/connman.service.in
+--- a/src/connman.service.in 2015-08-31 15:50:11.000000000 +0000
++++ b/src/connman.service.in 2016-04-15 11:04:37.057445255 +0000
+@@ -3,6 +3,7 @@
+ After=dbus.service network-pre.target
+ Before=network.target remote-fs-pre.target
+ Wants=network.target remote-fs-pre.target
++ConditionKernelCommandLine=!root=/dev/nfs
+
+ [Service]
+ Type=dbus