From 47e19f3ced5d0615c41c48f71c18e322732cf529 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Wed, 22 May 2019 21:44:17 +0700 Subject: [PATCH 33/34] x11, regular.mk: enable gdm and lightdm services instead of prefdm gdm3 and lightdm have their own startup services, and can no longer be started via prefdm. Other display managers still run through prefdm. See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=36769 --- conf.d/regular.mk | 1 - features.in/x11/config.mk | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 8434cbb8cb..b5089250fc 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -152,7 +152,6 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \ @$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done) @$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates) @$(call add,LIVE_PACKAGES,gnome-flashback screenpen) - @$(call add,DEFAULT_SERVICES_ENABLE,gdm) distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \ use/browser/falkon diff --git a/features.in/x11/config.mk b/features.in/x11/config.mk index 29b295f8ed..f6708f7874 100644 --- a/features.in/x11/config.mk +++ b/features.in/x11/config.mk @@ -74,16 +74,24 @@ use/x11/wacom: use/x11 use/x11/dm: use/x11-autostart @$(call try,THE_DISPLAY_MANAGER,xdm) @$(call add,THE_PACKAGES,$$(THE_DISPLAY_MANAGER)) + @$(call try,THE_DM_SERVICE,dm) + @$(call add,DEFAULT_SERVICES_ENABLE,$$(THE_DM_SERVICE)) use/x11/lightdm/gtk use/x11/lightdm/slick \ use/x11/lightdm/qt use/x11/lightdm/lxqt use/x11/lightdm/kde: \ use/x11/lightdm/%: use/x11/dm @$(call set,THE_DISPLAY_MANAGER,lightdm-$*-greeter) + @$(call set,THE_DM_SERVICE,lightdm) -use/x11/sddm use/x11/lxdm use/x11/gdm2.20 use/x11/gdm: \ +use/x11/lxdm use/x11/gdm2.20 use/x11/sddm: \ use/x11/%: use/x11/dm @$(call set,THE_DISPLAY_MANAGER,$*) +use/x11/gdm: \ + use/x11/%: use/x11/dm + @$(call set,THE_DISPLAY_MANAGER,$*) + @$(call set,THE_DM_SERVICE,$*) + use/x11/xdm: use/x11/dm @$(call set,THE_DISPLAY_MANAGER,xdm) @$(call add,THE_PACKAGES,installer-feature-no-xconsole-stage3) -- 2.21.0