Revert "dev, regular.mk: use/net-eth/networkd-dhcp for builder with systemd"

This reverts commit 88764f06. Using systemd-networkd for live is not the best choice. The ethernet interface may not be connected and the network wait will be very long. The best choice seems to be NetworkManager, which has no problems with this.

Revert "dev, regular.mk: use/net-eth/networkd-dhcp for builder with systemd"
733507dc · Anton Midyukov · a4b9e00c · 733507dc · 733507dc
Commit 733507dc authored Jun 01, 2025 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

regular.mk conf.d/regular.mk +3 -2

config.mk features.in/dev/config.mk +1 -2

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -209,8 +209,9 @@ distro/.regular-builder: distro/.regular-base mixin/regular-builder \
 	@$(call add,THE_PACKAGES,ccache cifs-utils wodim)
 	@$(call set,LIVE_NAME,ALT Builder $(BRANCH) Live)
-distro/regular-builder: distro/.regular-builder +systemd \
+distro/regular-builder: distro/.regular-builder +systemd +nm \
-	use/dev/builder/live/systemd; @:
+	use/dev/builder/live/systemd
+	@$(call add,THE_PACKAGES,NetworkManager-tui)
 # old regular-builder
 distro/regular-builder-sysv: distro/.regular-builder +sysvinit \

--- a/features.in/dev/config.mk
+++ b/features.in/dev/config.mk
@@ -28,8 +28,7 @@ ifeq (,$(filter-out x86_64 ,$(ARCH)))
 	@$(call add,LIVE_PACKAGES,livecd-qemu-arch qemu-user-binfmt_misc)
 endif
-use/dev/builder/live/systemd: use/dev/builder/live use/net-eth/networkd-dhcp \
+use/dev/builder/live/systemd: use/dev/builder/live
-	use/net/networkd/resolved
 	@$(call add,LIVE_PACKAGES,systemd-settings-disable-kill-user-processes)
 ifeq (,$(filter-out x86_64 ,$(ARCH)))
 	@$(call add,LIVE_PACKAGES,qemu-user-static-binfmt)