connman: Arrange patch file

Bug-AGL: SPEC-1181

Change-Id: I6670b0393a9121721076e7c2e424cc10e27d5309
Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>

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 b4704de..95fc0a9 100644 (file)
--- 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]