From 9113ff8eea83500109190e56a46e4b6d72ef448c Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 23 Sep 2009 17:13:48 +0000
Subject: pass autologin hash to set_autologin

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

(limited to 'perl-install/install/steps.pm')

diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 4c7d058e2..adc63d74f 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -721,11 +721,12 @@ sub addUser {
 
     any::add_users($users, $o->{authentication});
 
-    if ($o->{autologin}) {
-	$o->{desktop} ||= first(any::sessions());
-	$o->pkg_install("autologin") if !member($o->{desktop}, 'KDE', 'KDE4', 'GNOME');
+    my $autologin = { user => $o->{autologin}, desktop => $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, $o->{autologin}, $o->{desktop});
+    any::set_autologin($o->do_pkgs, $autologin);
 
     install::any::disable_user_view() if @$users == ();
 }
-- 
cgit v1.2.1