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/36769

x11, regular.mk: enable gdm and lightdm services instead of prefdm
db600e70 · Anton Midyukov · Michael Shigorin · 6dba5828 · db600e70 · db600e70
Commit db600e70 authored May 22, 2019 by Anton Midyukov Committed by Michael Shigorin May 29, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

regular.mk conf.d/regular.mk +0 -1

config.mk features.in/x11/config.mk +9 -1

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -149,7 +149,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

--- a/features.in/x11/config.mk
+++ b/features.in/x11/config.mk
@@ -70,16 +70,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)