diff options
author | Jack Mitchell <ml@embed.me.uk> | 2020-12-03 10:35:00 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-06 23:17:28 +0000 |
commit | 94f827ef0d752f0b6c8cd5a236f39219460e4e58 (patch) | |
tree | 3e2151794e8d2df86a7d6e893a95ec7a97bb05bc /meta/recipes-connectivity/connman/connman | |
parent | 30ae4f13b50668f837684e3a8e935cf08bdbb1ea (diff) | |
download | poky-94f827ef0d752f0b6c8cd5a236f39219460e4e58.tar.gz |
Revert "connman: set service to conflict with systemd-networkd"
Without further examples of how this is failing revert as using both
together is a valid use case, for example connman handling Wifi/AP
and systemd-networkd handling more complex routing such as for
containers and ethernet switches.
This reverts commit 5303420ead25817f5caec276b79eec7ee797271a.
(From OE-Core rev: 99d55bd094fe3d12724d77af3f15e2494cad4e0d)
Signed-off-by: Jack Mitchell <ml@embed.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/connman/connman')
-rw-r--r-- | meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch b/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch deleted file mode 100644 index dd012750a4..0000000000 --- a/meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 9fea099d0a3ece37d80ad70d32ebb8a93f8f3280 Mon Sep 17 00:00:00 2001 | ||
2 | From: Yi Zhao <yi.zhao@windriver.com> | ||
3 | Date: Fri, 30 Oct 2020 13:48:45 +0800 | ||
4 | Subject: [PATCH] connman.service: stop systemd-networkd when using connman | ||
5 | |||
6 | Stop systemd-networkd service when we use connman as network manager. | ||
7 | |||
8 | Upstream-Status: Inappropriate [configuration] | ||
9 | |||
10 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
11 | --- | ||
12 | src/connman.service.in | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/src/connman.service.in b/src/connman.service.in | ||
16 | index 79e75d6..014eafe 100644 | ||
17 | --- a/src/connman.service.in | ||
18 | +++ b/src/connman.service.in | ||
19 | @@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman | ||
20 | After=dbus.service network-pre.target systemd-sysusers.service | ||
21 | Before=network.target multi-user.target shutdown.target | ||
22 | Wants=network.target | ||
23 | +Conflicts=systemd-networkd.service systemd-networkd.socket | ||
24 | Conflicts=systemd-resolved.service | ||
25 | |||
26 | [Service] | ||
27 | -- | ||
28 | 2.17.1 | ||
29 | |||