diff options
author | Olivier Blin <oblin@mandriva.com> | 2009-09-23 16:11:03 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2009-09-23 16:11:03 +0000 |
commit | c16d335cfd015275bb2b2813b38215df45001d8d (patch) | |
tree | 58ea95adaa5c8349ff2780fd3c4e9235d135b728 /perl-install | |
parent | 971cd91b874681bbed3b4c49f6483a8ee469e265 (diff) | |
download | drakx-c16d335cfd015275bb2b2813b38215df45001d8d.tar drakx-c16d335cfd015275bb2b2813b38215df45001d8d.tar.gz drakx-c16d335cfd015275bb2b2813b38215df45001d8d.tar.bz2 drakx-c16d335cfd015275bb2b2813b38215df45001d8d.tar.xz drakx-c16d335cfd015275bb2b2813b38215df45001d8d.zip |
when detecting default desktop, use first session (instead of using hacks with dm config files)
Diffstat (limited to 'perl-install')
-rw-r--r-- | perl-install/any.pm | 2 |
1 files changed, 1 insertions, 1 deletions
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'); |