From 0c6eb606c362e477ea3423f8f7662bfbbe590e0b Mon Sep 17 00:00:00 2001 From: Changhyeok Bae Date: Wed, 13 Dec 2017 12:24:17 +0000 Subject: connman: Arrange patch file Bug-AGL: SPEC-1181 Change-Id: I6670b0393a9121721076e7c2e424cc10e27d5309 Signed-off-by: Changhyeok Bae --- .../connman/files/0001-disable-when-booting-over-nfs.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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] -- cgit 1.2.3-korg