init, stage2: set INSTALL2_INIT="systemd.unit=install2.target" for systemd

Booting the installer in systemd mode provides the following advantages: - the ability to use systemd-networkd and NetworkManager in the installer - further unify the work of the installer with its launch in live Next, it is planned to implement a session for launching the installer in wayland instead of xinit. You can continue to use install2-init by redefining the variable INSTALL2_INIT: @$(call set,INSTALL2_INIT,init=/usr/libexec/install2/install2-init)

init, stage2: set INSTALL2_INIT="systemd.unit=install2.target" for systemd
033b2c02 · Anton Midyukov · d2985180 · 033b2c02 · 033b2c02
Commit 033b2c02 authored May 18, 2025 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 5 deletions

config.mk features.in/init/config.mk +13 -0

config.mk features.in/stage2/config.mk +0 -5

No files found.
--- a/features.in/init/config.mk
+++ b/features.in/init/config.mk
@@ -10,6 +10,9 @@ use/init: use/pkgpriorities
 	@$(call add,SYSTEM_PACKAGES,kbd kbd-data)
 ifeq (,$(filter-out p10 c10%,$(BRANCH)))
 	@$(call add,THE_PACKAGES,startup) # contains configs needed all
+ifeq (distro,$(IMAGE_CLASS))
+	@$(call try,INSTALL2_INIT,init=/usr/sbin/install2-init)
+endif
 endif

 # THE_LISTS is too late when BASE_PACKAGES have pulled in
@@ -26,6 +29,11 @@ use/init/sysv: use/init
 ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
 	@$(call add,THE_PACKAGES,mount-efivars)
 endif
+ifneq (,$(filter-out p10 c10%,$(BRANCH)))
+ifeq (distro,$(IMAGE_CLASS))
+	@$(call try,INSTALL2_INIT,init=/usr/libexec/install2/install2-init)
+endif
+endif

 use/init/sysv/polkit: use/init/sysv
 	@$(call add,THE_PACKAGES,polkit-sysvinit)
@@ -33,7 +41,12 @@ use/init/sysv/polkit: use/init/sysv
 ### i-f should be dropped as soon as rootfs scripts are effective there
 use/init/systemd: use/init
 	@$(call set,INIT_TYPE,systemd)
+ifeq (distro,$(IMAGE_CLASS))
+ifneq (,$(filter-out p10 c10%,$(BRANCH)))
 	@$(call add,INSTALL2_PACKAGES,systemd-sysvinit)
+	@$(call try,INSTALL2_INIT,systemd.unit=install2.target)
+endif
+endif

 use/init/systemd/full: use/init/systemd
 	@$(call add,THE_PACKAGES,chkconfig)

--- a/features.in/stage2/config.mk
+++ b/features.in/stage2/config.mk
@@ -3,11 +3,6 @@ use/stage2:: sub/stage1
 	@$(call add_feature)
 	@$(call add,STAGE1_PACKAGES,make-initrd file iproute2)
 	@$(call add,STAGE1_MODLISTS,$$(FEATURES))
-ifeq (,$(filter-out sisyphus p11 c11%,$(BRANCH)))
-	@$(call try,INSTALL2_INIT,init=/usr/libexec/install2/install2-init)
-else
-	@$(call try,INSTALL2_INIT,init=/usr/sbin/install2-init)
-endif
 	@$(call xport,STAGE1_PACKAGES)
 	@$(call xport,STAGE1_KCONFIG)