summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-09-23 16:11:03 +0000
committerOlivier Blin <oblin@mandriva.com>2009-09-23 16:11:03 +0000
commitc16d335cfd015275bb2b2813b38215df45001d8d (patch)
tree58ea95adaa5c8349ff2780fd3c4e9235d135b728 /perl-install/any.pm
parent971cd91b874681bbed3b4c49f6483a8ee469e265 (diff)
downloaddrakx-backup-do-not-use-c16d335cfd015275bb2b2813b38215df45001d8d.tar
drakx-backup-do-not-use-c16d335cfd015275bb2b2813b38215df45001d8d.tar.gz
drakx-backup-do-not-use-c16d335cfd015275bb2b2813b38215df45001d8d.tar.bz2
drakx-backup-do-not-use-c16d335cfd015275bb2b2813b38215df45001d8d.tar.xz
drakx-backup-do-not-use-c16d335cfd015275bb2b2813b38215df45001d8d.zip
when detecting default desktop, use first session (instead of using hacks with dm config files)
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm2
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');