aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChanghyeok Bae <changhyeok.bae@gmail.com>2017-12-13 12:24:17 +0000
committerJosé Bollo <jose.bollo@iot.bzh>2018-02-13 11:01:59 +0100
commit0c6eb606c362e477ea3423f8f7662bfbbe590e0b (patch)
treeacd78c1d4e3d7a3189da4164816ba9bd3e052650
parentf1f55eab0c57448a9cbb122947266b6ccde5eb1f (diff)
connman: Arrange patch file
Bug-AGL: SPEC-1181 Change-Id: I6670b0393a9121721076e7c2e424cc10e27d5309 Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
-rw-r--r--meta-agl/recipes-connectivity/connman/files/0001-disable-when-booting-over-nfs.patch3
1 files changed, 2 insertions, 1 deletions
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
index b4704de68..95fc0a905 100644
--- 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
@@ -1,9 +1,10 @@
--- a/src/connman.service.in 2016-08-15 13:51:03.479478140 +0200
+++ b/src/connman.service.in 2016-08-15 13:51:33.469478267 +0200
-@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/co
+@@ -7,6 +7,7 @@ RequiresMountsFor=@localstatedir@/lib/co
After=dbus.service network-pre.target systemd-sysusers.service
Before=network.target multi-user.target shutdown.target
Wants=network.target
+ Conflicts=systemd-resolved.service
+ConditionKernelCommandLine=!root=/dev/nfs
[Service]