diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-09-23 17:13:48 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-09-23 17:13:48 +0000 |
| commit | 9113ff8eea83500109190e56a46e4b6d72ef448c (patch) | |
| tree | d616e9a19fd5b7a618c80242bdaab4148fb8cdca /perl-install/install/steps.pm | |
| parent | c0b4e0aba4f8b5d1235e7b473359732d00cdcd1b (diff) | |
| download | drakx-backup-do-not-use-9113ff8eea83500109190e56a46e4b6d72ef448c.tar drakx-backup-do-not-use-9113ff8eea83500109190e56a46e4b6d72ef448c.tar.gz drakx-backup-do-not-use-9113ff8eea83500109190e56a46e4b6d72ef448c.tar.bz2 drakx-backup-do-not-use-9113ff8eea83500109190e56a46e4b6d72ef448c.tar.xz drakx-backup-do-not-use-9113ff8eea83500109190e56a46e4b6d72ef448c.zip | |
pass autologin hash to set_autologin
Diffstat (limited to 'perl-install/install/steps.pm')
| -rw-r--r-- | perl-install/install/steps.pm | 9 |
1 files changed, 5 insertions, 4 deletions
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 == (); } |