summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-09-23 17:16:07 +0000
committerOlivier Blin <oblin@mandriva.com>2009-09-23 17:16:07 +0000
commita2f1a38883ce87890bfc9918b908ff0672e05f91 (patch)
tree63f1cf1edbe6dfd8870f37b42dedc9ec9e726e37 /perl-install/install
parent9113ff8eea83500109190e56a46e4b6d72ef448c (diff)
downloaddrakx-a2f1a38883ce87890bfc9918b908ff0672e05f91.tar
drakx-a2f1a38883ce87890bfc9918b908ff0672e05f91.tar.gz
drakx-a2f1a38883ce87890bfc9918b908ff0672e05f91.tar.bz2
drakx-a2f1a38883ce87890bfc9918b908ff0672e05f91.tar.xz
drakx-a2f1a38883ce87890bfc9918b908ff0672e05f91.zip
use get_autologin to read autologin settings in install (and thus get default dm)
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/steps.pm5
1 files 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);