regular.mk, regular-vm.mk: added +systemd to +systemd-optimal

conf.d/regular-vm.mk

@@ -31,7 +31,7 @@ ifeq (,$(filter-out armh aarch64,$(ARCH)))
 	@$(call add,THE_LISTS,remote-access)
 endif
 
-vm/.regular-desktop: vm/systemd mixin/regular-vm-x11 +systemd-optimal; @:
+vm/.regular-desktop: vm/systemd mixin/regular-vm-x11 +systemd +systemd-optimal; @:
 
 vm/.regular-desktop-sysv: vm/bare mixin/regular-vm-x11 use/x11/gdm2.20 \
 	use/init/sysv/polkit +power; @:

conf.d/regular.mk

@@ -28,7 +28,7 @@ distro/.regular-wm: distro/.regular-x11 mixin/regular-x11 \
 # DE base target
 # TODO: use/plymouth/live when luks+plymouth is done, see also #28255
 distro/.regular-desktop: distro/.regular-wm \
-	use/syslinux/ui/gfxboot use/firmware/laptop +systemd-optimal
+	use/syslinux/ui/gfxboot use/firmware/laptop +systemd +systemd-optimal
 	@$(call add,THE_BRANDING,bootloader)
 	@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
 	@$(call set,KFLAVOURS,std-def)
@@ -84,7 +84,8 @@ distro/.regular-jeos-full: distro/.regular-jeos \
 distro/regular-jeos-sysv: distro/.regular-jeos-full use/cleanup/jeos/full \
 	+sysvinit; @:
 
-distro/regular-jeos-systemd: distro/.regular-jeos-full +systemd; @:
+distro/regular-jeos-systemd: distro/.regular-jeos-full \
+	+systemd +systemd-optimal; @:
 
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 # NB: no +efi as it brings in grub2 (no ELILO support for system boot)
@@ -198,7 +199,9 @@ distro/.regular-server-full: distro/.regular-server-managed \
 	@$(call add,MAIN_GROUPS,server/sambaDC)
 	@$(call add,MAIN_GROUPS,tools/hyperv)
 
-distro/regular-server-systemd: distro/.regular-server-full +systemd; @:
+distro/regular-server-systemd: distro/.regular-server-full \
+	+systemd +systemd-optimal; @:
+
 distro/regular-server-sysv: distro/.regular-server-full +sysvinit; @:
 
 distro/.regular-server-ovz: distro/.regular-server \