From 88481ecc8106ccff7709cd1f9bcf4bc4f9837128 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Wed, 16 May 2012 18:22:32 +0300 Subject: [PATCH] live-razorqt: lightdm tweaks lightdm-1.1+ handling had to be corrected regarding the separate greeters. --- conf.d/live.mk | 5 +++-- features.in/x11/config.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/conf.d/live.mk b/conf.d/live.mk index 0c38cabd..3e1677d8 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -32,7 +32,7 @@ distro/live-install: distro/.live-base use/live/textinst; @: distro/.livecd-install: distro/.live-base use/live/install; @: distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @: -distro/live-razorqt: distro/.live-desktop +razorqt; @: +distro/live-razorqt: distro/.live-desktop use/live/autologin +razorqt; @: distro/live-tde: distro/.live-desktop use/live/ru +tde; @: distro/live-rescue: distro/live-icewm @@ -54,7 +54,8 @@ distro/live-flightgear: distro/live-icewm use/live/sound use/x11/3d-proprietary distro/live-cinnamon: distro/.live-desktop use/live/autologin use/live/ru \ use/x11/cinnamon use/x11/3d-proprietary -distro/live-enlightenment: distro/.live-desktop use/live/autologin use/live/ru use/x11/3d-free +distro/live-enlightenment: distro/.live-desktop use/live/autologin \ + use/live/ru use/x11/3d-free @$(call add,LIVE_PACKAGES,enlightenment) distro/live-gimp: distro/live-icewm use/x11/3d-free use/live/ru diff --git a/features.in/x11/config.mk b/features.in/x11/config.mk index 01a503df..c5f46c9a 100644 --- a/features.in/x11/config.mk +++ b/features.in/x11/config.mk @@ -1,5 +1,5 @@ +icewm: use/x11/icewm; @: -+razorqt: use/x11/razorqt use/x11/lightdm; @: ++razorqt: use/x11/razorqt use/x11/lightdm/qt; @: +tde: use/x11/tde use/x11/kdm; @: use/x11/xorg: @@ -30,8 +30,8 @@ use/x11/xdm: use/x11/runlevel5 @$(call add,THE_PACKAGES,xdm installer-feature-no-xconsole) ### : some set()-like thing might be better? -use/x11/lightdm: use/x11/runlevel5 - @$(call add,THE_PACKAGES,lightdm) +use/x11/lightdm/qt use/x11/lightdm/gtk: use/x11/lightdm/%: use/x11/runlevel5 + @$(call add,THE_PACKAGES,lightdm-$*-greeter) use/x11/kdm: use/x11/runlevel5 @$(call add,THE_PACKAGES,kdebase-kdm)