Commit 50e81bd9 authored by Anton Midyukov's avatar Anton Midyukov

Remove +systemd-optimal everything

This set of systemd settings does not seem so optimal anymore. For example, systemd-settings-enable-showstatus breaks the output of messages when using plymouth. On top of the messages that plymouth has accumulated, systemd messages are superimposed. This is critical when running the installer in systemd. And the message wall on tty12 outputs localized messages to the non-unicode console.
parent 5ffdbfdb
......@@ -5,7 +5,7 @@ vm/mate-a11y: vm/systemd mixin/regular-vm-base mixin/regular-x11 \
mixin/regular-desktop mixin/mate-base mixin/vm-archdep-x11 \
use/deflogin/privileges use/deflogin/xgrp use/deflogin/hardware \
use/deflogin/root use/x11-autologin use/l10n/ru_RU use/x11/lightdm/gtk \
+systemd +systemd-optimal +vmguest \
+systemd +vmguest \
use/services/bluetooth-enable
@$(call add,USERS,altlinux:altlinux:1:1)
@$(call add,THE_PACKAGES,bluez blueman)
......
......@@ -2,7 +2,7 @@ ifeq (distro,$(IMAGE_CLASS))
distro/alt-platform-builder: \
distro/.base use/live-install/pkg \
use/cleanup \
+systemd +systemd-optimal \
+systemd \
use/memtest +efi \
use/dev/builder/base \
use/net/dhcp use/ntp/chrony \
......
ifeq (distro,$(IMAGE_CLASS))
distro/regular-engineering-live: distro/.regular-x11 +systemd +systemd-optimal \
distro/regular-engineering-live: distro/.regular-x11 +systemd \
mixin/regular-desktop mixin/regular-gnome use/x11/gdm \
use/l10n +nm-gtk4 +plymouth \
use/live/ru use/live/rw use/live/desktop \
......
mixin/cnc-rt: use/l10n +nm-gtk +systemd +systemd-optimal +x11 \
mixin/cnc-rt: use/l10n +nm-gtk +systemd +x11 \
mixin/regular-desktop mixin/regular-lxqt use/x11/lightdm/gtk \
use/cleanup
@$(call set,KFLAVOURS,rt)
......
......@@ -21,7 +21,7 @@ endif
@$(call add,THE_PACKAGES,vim-console)
@$(call add,KMODULES,staging)
vm/.regular-desktop: vm/systemd +systemd +systemd-optimal +plymouth \
vm/.regular-desktop: vm/systemd +systemd +plymouth \
mixin/regular-vm-base mixin/regular-x11 \
mixin/regular-desktop use/oem/vnc \
use/services/bluetooth-enable
......
......@@ -65,7 +65,7 @@ endif
# DE base target
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
distro/.regular-desktop: distro/.regular-wm use/branding/full \
use/firmware/laptop +systemd +systemd-optimal +vmguest \
use/firmware/laptop +systemd +vmguest \
use/live-install/oem use/services/bluetooth-enable \
use/live/rescue
ifeq (,$(filter-out sisyphus p11,$(BRANCH)))
......@@ -101,7 +101,7 @@ distro/.regular-jeos: distro/.regular-jeos-base use/cleanup \
distro/regular-jeos-sysv: distro/.regular-jeos +sysvinit +power; @:
distro/regular-jeos-systemd: distro/.regular-jeos +systemd +systemd-optimal; @:
distro/regular-jeos-systemd: distro/.regular-jeos +systemd; @:
distro/regular-icewm: distro/.regular-desktop use/x11/lightdm/gtk \
mixin/regular-icewm
......@@ -194,7 +194,7 @@ distro/.regular-server-full: distro/.regular-server-managed \
@$(call add,BASE_KMODULES,staging)
distro/regular-server-systemd: distro/.regular-server-full \
+systemd +systemd-optimal; @:
+systemd; @:
distro/regular-server-sysv: distro/.regular-server-full +sysvinit +power; @:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment