regular.mk: switch regular-builder on systemd

This will allow: - When bootloading, set 'console=' to gain access to the sequential console. Needed for SBC and QEMU. - When you bootload to receive a ready-to-work environment for building rpm-packages and images for other architectures with hasher + qemu-static.

regular.mk: switch regular-builder on systemd
8e589371 · Anton Midyukov · ba00aa4d · 8e589371
Commit 8e589371 authored Jan 14, 2022 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

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

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -256,11 +256,18 @@ distro/regular-server-pve: distro/.regular-server-base +systemd \
 		pve-firewall pve-ha-crm pve-manager pveproxy pvedaemon \
 		pvefw-logger pve-ha-lrm pvenetcommit pvestatd spiceproxy)

-distro/regular-builder: distro/.regular-bare mixin/regular-builder \
-	use/dev/builder/live/sysv use/stage2/kms +sysvinit +efi +power +nm \
+distro/.regular-builder: distro/.regular-bare mixin/regular-builder \
+	use/stage2/kms +efi +power \
 	use/live/base use/live/rw use/live/repo use/live/textinstall \
 	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; @:
+
+# old regular-builder
+distro/regular-builder-sysv: distro/.regular-builder +sysvinit \
+	use/dev/builder/live/sysv
 	@$(call add,THE_PACKAGES,livecd-net-eth)

 distro/regular-server-samba4: distro/.regular-server-managed +systemd