regular.mk: fix enabling gdm.service for gnome3

services feature works like this:

  1. enable whatever services are in DEFAULT_SERVICES_ENABLE
  2. disable whatever is in DEFAULT_SERVICES_DISABLE
  3. enable services in SERVICES_ENABLE
  4. finally, disable those in SERVICES_DISABLE

So one should not disable display-manager service!

Disabling prefdm is not needed as it doesn't start
when display-manager.service symlink exists.
This commit is contained in:
Anton Midyukov 2018-05-22 13:29:19 +07:00 committed by Michael Shigorin
parent bb52ad4741
commit 8c58310716

View File

@ -164,7 +164,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_DISABLE,display-manager)
@$(call add,DEFAULT_SERVICES_ENABLE,gdm) @$(call add,DEFAULT_SERVICES_ENABLE,gdm)
distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \ distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \