Revert "connman: set service to conflict with systemd-networkd"
PATCH 1/3 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.
--- ...stop-systemd-networkd-when-using-con.patch | 29 ------------------- .../connman/connman_1.38.bb | 1 - 2 files changed, 30 deletions(-) delete mode 100644 meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch
meta/recipes-connectivity/connman/connman/0001-connman.service-stop-systemd-networkd-when-using-con.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From 9fea099d0a3ece37d80ad70d32ebb8a93f8f3280 Mon Sep 17 00:00:00 2001 -From: Yi Zhao <[email protected]> -Date: Fri, 30 Oct 2020 13:48:45 +0800 -Subject: [PATCH] connman.service: stop systemd-networkd when using connman - -Stop systemd-networkd service when we use connman as network manager. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Yi Zhao <[email protected]> ---- - src/connman.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/connman.service.in b/src/connman.service.in -index 79e75d6..014eafe 100644 ---- a/src/connman.service.in -+++ b/src/connman.service.in -@@ -6,6 +6,7 @@ RequiresMountsFor=@localstatedir@/lib/connman - After=dbus.service network-pre.target systemd-sysusers.service - Before=network.target multi-user.target shutdown.target - Wants=network.target -+Conflicts=systemd-networkd.service systemd-networkd.socket - Conflicts=systemd-resolved.service - - [Service] --- -2.17.1 -
meta/recipes-connectivity/connman/connman_1.38.bb +0 -1
@@ -3,7 +3,6 @@ require connman.inc SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://0001-plugin.h-Change-visibility-to-default-for-debug-symb.patch \ file://0001-connman.service-stop-systemd-resolved-when-we-use-co.patch \ - file://0001-connman.service-stop-systemd-networkd-when-using-con.patch \ file://connman \ file://no-version-scripts.patch \ "
Signature · 1 line
2.29.2
PATCH 2/3 systemd-conf: add PACKAGECONFIG to enable/disable auto ethernet DHCP
Allow distros which include other network managers to disable the auto DHCP setup of interfaces in systemd-networkd.
--- meta/recipes-core/systemd/systemd-conf_246.1.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
meta/recipes-core/systemd/systemd-conf_246.1.bb +7 -1
@@ -5,6 +5,9 @@ DefaultTimeoutStartSec setting." LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PACKAGECONFIG ??= "dhcp-ethernet" +PACKAGECONFIG[dhcp-ethernet] = "" + SRC_URI = "\ file://journald.conf \ file://logind.conf \
@@ -17,7 +20,10 @@ do_install() { install -D -m0644 ${WORKDIR}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf install -D -m0644 ${WORKDIR}/logind.conf ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf install -D -m0644 ${WORKDIR}/system.conf ${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf - install -D -m0644 ${WORKDIR}/wired.network ${D}${systemd_unitdir}/network/80-wired.network + + if ${@bb.utils.contains('PACKAGECONFIG', 'dhcp-ethernet', 'true', 'false', d)}; then + install -D -m0644 ${WORKDIR}/wired.network ${D}${systemd_unitdir}/network/80-wired.network + fi } # Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52
Signature · 1 line
2.29.2
PATCH 3/3 systemd-conf: match ethernet interfaces by type rather than globbing
In reply to Jack MitchellIf we say we're enabling DHCP on wired/ethernet networks lets be more specific than trying to catch everything with globbing.
--- meta/recipes-core/systemd/systemd-conf/wired.network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd-conf/wired.network +1 -1
@@ -1,5 +1,5 @@ [Match] -Name=en* eth* +Type=ether KernelCommandLine=!nfsroot [Network]
Signature · 1 line
2.29.2