From: Stefan Schmidt <[email protected]> In cases where we configure the IP address and more on the kernel command line with ip= we should not ask for DHCP with systemd-networkd later on. We have such a setup with our runqemu script.
With this match in place we can also deploy this unit on qemu systems. Signed-off-by: Stefan Schmidt <[email protected]> Signed-off-by: Richard Purdie <[email protected]> (cherry picked from commit 8c4981e740c0e630200dbc77c9e3dfd3e43b790b) --- meta/recipes-core/systemd/systemd-conf/wired.network | 1 + meta/recipes-core/systemd/systemd-conf_244.3.bb | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/meta/recipes-core/systemd/systemd-conf/wired.network b/meta/recipes-core/systemd/systemd-conf/wired.network index ff807ba31f..34c20fcb24 100644 --- a/meta/recipes-core/systemd/systemd-conf/wired.network +++ b/meta/recipes-core/systemd/systemd-conf/wired.network @@ -1,6 +1,7 @@ [Match] Name=en* eth* KernelCommandLine=!nfsroot +KernelCommandLine=!ip [Network] DHCP=yes diff --git a/meta/recipes-core/systemd/systemd-conf_244.3.bb b/meta/recipes-core/systemd/systemd-conf_244.3.bb index d9ec023bfd..9b797a91f4 100644 --- a/meta/recipes-core/systemd/systemd-conf_244.3.bb +++ b/meta/recipes-core/systemd/systemd-conf_244.3.bb @@ -23,9 +23,6 @@ do_install() { # Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52 do_install_append_qemuall() { install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf - - # Do not install wired.network for qemu bsps - rm -rf ${D}${systemd_unitdir}/network } PACKAGE_ARCH = "${MACHINE_ARCH}" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#149877): https://lists.openembedded.org/g/openembedded-core/message/149877 Mute This Topic: https://lists.openembedded.org/mt/81578166/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
