Correct gdm/gdm3 handling, prefere gdm for squeeze as before and use gdm3 for everything else.

This commit is contained in:
Daniel Baumann 2011-07-08 18:41:54 +02:00
parent ecd8dca2ba
commit 3a44d9acbd
2 changed files with 9 additions and 3 deletions

View File

@ -3,6 +3,11 @@
#include <standard-x11>
lxde
#if DISTRIBUTION squeeze
gdm
#endif
#nif DISTRIBUTION squeeze
gdm3
#endif
network-manager-gnome
desktop-base

View File

@ -39,8 +39,9 @@ Check_lockfile .lock
Create_lockfile .lock
case "${LB_PARENT_DISTRIBUTION}" in
squeeze|wheezy|sid)
if echo "${LB_TASKS}" | grep -qs xfce
squeeze)
if echo "${LB_TASKS}" | grep -qs lxde ||
echo "${LB_TASKS}" | grep -qs xfce
then
GDM="gdm"
else
@ -49,7 +50,7 @@ case "${LB_PARENT_DISTRIBUTION}" in
;;
*)
GDM="gdm"
GDM="gdm3"
;;
esac