helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-05-15 19:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

networkmanager: Do not ship initrd specific services into rootfs

Browse Source 
Those systemd services were added in 1.54 upstream
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2089

According the comments we can see they are meant for the inird
other than using for rootfs. They will conflict with the main
services and can lead to potentially confusing error messages.
So remove them for now to avoid the following issue.

>$systemd-analyze --man=false verify \
> /lib/systemd/system/NetworkManager-wait-online-initrd.service
  Failed to put bus name to hashmap: File exists
  NetworkManager-initrd.service: Two services allocated for the \
  same bus name org.freedesktop.NetworkManager, refusing operation.

Test:
PASS: bitbake core-image-minimal
PASS: runqemu qemux86-64
PASS: systemd-analyze --man=false verify \
      /lib/systemd/system/NetworkManager.service

Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
This commit is contained in:
Zhixiong Chi 2026-04-08 09:17:40 +00:00 committed by Khem Raj
parent b177ff1454
commit c90f012855
No known key found for this signature in database
GPG Key ID: BB053355919D3314
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta-networking/recipes-connectivity/networkmanager/networkmanager_1.56.0.bb
View File

@ -311,4 +311,9 @@ do_install:append() {
if ${@bb.utils.contains('PACKAGECONFIG','dhcpcd','true','false',d)}; then
install -Dm 0644 ${UNPACKDIR}/enable-dhcpcd.conf ${D}${nonarch_libdir}/NetworkManager/conf.d/enable-dhcpcd.conf
fi
# Don't ship initrd specific services into rootfs to avoid the conflict with the main services
rm -f ${D}${systemd_system_unitdir}/NetworkManager-config-initrd.service
rm -f ${D}${systemd_system_unitdir}/NetworkManager-initrd.service
rm -f ${D}${systemd_system_unitdir}/NetworkManager-wait-online-initrd.service
}