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

We replace network manager with the standard systemd networkd. Automatic configuration of wired connections for dhcp should be enough.

dev, regular.mk: use/net-eth/networkd-dhcp for builder with systemd
88764f06 · Anton Midyukov · 3b458fcb · 88764f06 · 88764f06
Commit 88764f06 authored Dec 06, 2024 by Anton Midyukov
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

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

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

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -249,9 +249,8 @@ distro/.regular-builder: distro/.regular-base mixin/regular-builder \
 	use/isohybrid use/syslinux/timeout/300 use/grub/timeout/30
 	@$(call add,THE_PACKAGES,ccache cifs-utils wodim)

-distro/regular-builder: distro/.regular-builder +systemd +nm \
-	use/dev/builder/live/systemd
-	@$(call add,THE_PACKAGES,NetworkManager-tui)
+distro/regular-builder: distro/.regular-builder +systemd \
+	use/dev/builder/live/systemd; @:

 # old regular-builder
 distro/regular-builder-sysv: distro/.regular-builder +sysvinit \

--- a/features.in/dev/config.mk
+++ b/features.in/dev/config.mk
@@ -24,7 +24,8 @@ 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/dev/builder/live/systemd: use/dev/builder/live use/net-eth/networkd-dhcp \
+	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)