From a2f1a38883ce87890bfc9918b908ff0672e05f91 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 23 Sep 2009 17:16:07 +0000
Subject: use get_autologin to read autologin settings in install (and thus get
 default dm)

---
 perl-install/install/steps.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index adc63d74f..8ad398c4c 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -721,9 +721,10 @@ sub addUser {
 
     any::add_users($users, $o->{authentication});
 
-    my $autologin = { user => $o->{autologin}, desktop => $o->{desktop} };
+    my $autologin = any::get_autologin();
+    $autologin->{user} = $o->{autologin};
+    $autologin->{desktop} = $o->{desktop} if $o->{desktop};
     if ($autologin->{user}) {
-	$autologin->{desktop} ||= first(any::sessions());
 	$o->pkg_install("autologin") if !member($autologin->{desktop}, 'KDE', 'KDE4', 'GNOME');
     }
     any::set_autologin($o->do_pkgs, $autologin);
-- 
cgit v1.2.1