Skip to content

M
mkimage-profiles
Commit db600e70 authored by Anton Midyukov's avatar Anton Midyukov Committed by Michael Shigorin
Browse files
Options

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
parent 6dba5828
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
conf.d/regular.mk
View file @ db600e70
...@@ -149,7 +149,6 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \ ...@@ -149,7 +149,6 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done) @$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
@$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates) @$(call add,LIVE_PACKAGES,gnome3-regular xcalib templates)
@$(call add,LIVE_PACKAGES,gnome-flashback screenpen) @$(call add,LIVE_PACKAGES,gnome-flashback screenpen)
@$(call add,DEFAULT_SERVICES_ENABLE,gdm)
distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \ distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth \
use/browser/falkon use/browser/falkon
......
features.in/x11/config.mk
View file @ db600e70
...@@ -70,16 +70,24 @@ use/x11/wacom: use/x11 ...@@ -70,16 +70,24 @@ use/x11/wacom: use/x11
use/x11/dm: use/x11-autostart use/x11/dm: use/x11-autostart
@$(call try,THE_DISPLAY_MANAGER,xdm) @$(call try,THE_DISPLAY_MANAGER,xdm)
@$(call add,THE_PACKAGES,$$(THE_DISPLAY_MANAGER)) @$(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/gtk use/x11/lightdm/slick \
use/x11/lightdm/qt use/x11/lightdm/lxqt use/x11/lightdm/kde: \ use/x11/lightdm/qt use/x11/lightdm/lxqt use/x11/lightdm/kde: \
use/x11/lightdm/%: use/x11/dm use/x11/lightdm/%: use/x11/dm
@$(call set,THE_DISPLAY_MANAGER,lightdm-$*-greeter) @$(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 use/x11/%: use/x11/dm
@$(call set,THE_DISPLAY_MANAGER,$*) @$(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 use/x11/xdm: use/x11/dm
@$(call set,THE_DISPLAY_MANAGER,xdm) @$(call set,THE_DISPLAY_MANAGER,xdm)
@$(call add,THE_PACKAGES,installer-feature-no-xconsole-stage3) @$(call add,THE_PACKAGES,installer-feature-no-xconsole-stage3)
......
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