1*4882a593SmuzhiyunFrom 9f70b94ebf18f52c115634642652830fa77f27a1 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: "Maxin B. John" <maxin.john@intel.com> 3*4882a593SmuzhiyunDate: Mon, 12 Jun 2017 16:52:39 +0300 4*4882a593SmuzhiyunSubject: [PATCH] connman.service: stop systemd-resolved when we use connman 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunStop systemd-resolved service when we use connman as network manager. 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunUpstream-Status: Inappropriate [configuration] 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Maxin B. John <maxin.john@intel.com> 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun src/connman.service.in | 1 + 13*4882a593Smuzhiyun 1 file changed, 1 insertion(+) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/src/connman.service.in b/src/connman.service.in 16*4882a593Smuzhiyunindex 9f5c10f..dab48bc 100644 17*4882a593Smuzhiyun--- a/src/connman.service.in 18*4882a593Smuzhiyun+++ b/src/connman.service.in 19*4882a593Smuzhiyun@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman 20*4882a593Smuzhiyun After=dbus.service network-pre.target systemd-sysusers.service 21*4882a593Smuzhiyun Before=network.target multi-user.target shutdown.target 22*4882a593Smuzhiyun Wants=network.target 23*4882a593Smuzhiyun+Conflicts=systemd-resolved.service 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun [Service] 26*4882a593Smuzhiyun Type=dbus 27*4882a593Smuzhiyun-- 28*4882a593Smuzhiyun2.4.0 29*4882a593Smuzhiyun 30