From c16d335cfd015275bb2b2813b38215df45001d8d Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Wed, 23 Sep 2009 16:11:03 +0000 Subject: when detecting default desktop, use first session (instead of using hacks with dm config files) --- perl-install/any.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'perl-install/any.pm') diff --git a/perl-install/any.pm b/perl-install/any.pm index 46482b852..c9701f761 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -639,7 +639,7 @@ sub get_autologin() { my %desktop = getVarsFromSh("$::prefix/etc/sysconfig/desktop"); my $gdm_file = "$::prefix/etc/X11/gdm/custom.conf"; my $kdm_file = common::read_alternative('kdm4-config'); - my $desktop = $desktop{DESKTOP} || (! -e $kdm_file && -e $gdm_file ? 'GNOME' : 'KDE4'); + my $desktop = $desktop{DESKTOP} || first(sessions()); my $autologin = do { if (($desktop{DISPLAYMANAGER} || $desktop) eq 'GNOME') { my %conf = read_gnomekderc($gdm_file, 'daemon'); -- cgit v1.2.1