mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-01 21:23:51 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/network-manager: drop initrd-related services when unneeded

Browse Source 
Since NetworkManager 1.54, packaged since commit 24827ae398
(package/network-manager: bump to 1.56.0), new services related to
running in an initrd are now installed, which prevents proper startup,
with systemd reporting that two units declare the same BusName.

When systemd is configured without initrd support, drop the
NetworkManager initrd-related services.

Fixes: 24827ae398

Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
Cc: Fiona Klute <fiona.klute@gmx.de>
Cc: Marcus Hoffmann <buildroot@bubu1.eu>
Acked-by: TIAN Yuanhao <tianyuanhao3@163.com>
Signed-off-by: Fiona Klute <fiona.klute@gmx.de>
This commit is contained in:
Yann E. MORIN
2026-06-15 13:06:05 +02:00
committed by Fiona Klute
parent 1e7187e1ad
commit 32bdc4710a
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
package/network-manager/network-manager.mk
View File

@@ -151,6 +151,12 @@ NETWORK_MANAGER_CONF_OPTS += \
-Dconfig_logging_backend_default=journal \ -Dconfig_logging_backend_default=journal \
-Dsession_tracking=systemd \ -Dsession_tracking=systemd \
-Dsuspend_resume=systemd -Dsuspend_resume=systemd
ifneq ($(BR2_PACKAGE_SYSTEMD_INITRD),y)
define NETWORK_MANAGER_CLEAN_INITRD
rm -f $(TARGET_DIR)/usr/lib/systemd/system/NetworkManager-*initrd.service
endef
NETWORK_MANAGER_POST_INSTALL_TARGET_HOOKS += NETWORK_MANAGER_CLEAN_INITRD
endif
else else
NETWORK_MANAGER_CONF_OPTS += \ NETWORK_MANAGER_CONF_OPTS += \
-Dsystemd_journal=false \ -Dsystemd_journal=false \