Merge "enabling kernel 4.14"

[AGL/meta-agl.git] / meta-agl / recipes-connectivity / connman / files / 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
index a95bc5a..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,10 +1,10 @@
-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
+--- 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
+@@ -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]