summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-04-05 15:21:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-04-05 15:21:37 +0000
commitfccabef5bb06627331fa4d0d8337eb1d36226d3c (patch)
tree8795876b2c98ebcd0d7f311cf6cbc1750c4cb534
parentf6131777949414385eddec3b956ea80c5a41db20 (diff)
downloaddrakx-fccabef5bb06627331fa4d0d8337eb1d36226d3c.tar
drakx-fccabef5bb06627331fa4d0d8337eb1d36226d3c.tar.gz
drakx-fccabef5bb06627331fa4d0d8337eb1d36226d3c.tar.bz2
drakx-fccabef5bb06627331fa4d0d8337eb1d36226d3c.tar.xz
drakx-fccabef5bb06627331fa4d0d8337eb1d36226d3c.zip
ask for autologin
-rw-r--r--perl-install/any.pm7
-rw-r--r--perl-install/install_steps_interactive.pm7
2 files changed, 6 insertions, 8 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 860be48f0..f20f84165 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -751,17 +751,16 @@ sub ask_users {
}
sub autologin {
- my ($prefix, $o, $in, $install) = @_;
+ my ($prefix, $o, $in) = @_;
my $cmd = $prefix ? "chroot $prefix" : "";
my @wm = (split (' ', `$cmd /usr/sbin/chksession -l`));
- my @users;
- if (@wm && @users && !$o->{authentication}{NIS} && $ENV{SECURE_LEVEL} <= 3) {
+ if (@wm && !is_empty_array_ref($o->{users}) && !$o->{authentication}{NIS} && $ENV{SECURE_LEVEL} <= 3) {
$in->ask_from_entries_refH(_("Autologin"),
_("I can set up your computer to automatically log on one user.
If you don't want to use this feature, click on the cancel button."),
- [ { label => _("Choose the default user:"), val => \$o->{autologin}, list => [ '', @users ] },
+ [ { label => _("Choose the default user:"), val => \$o->{autologin}, list => [ '', @{$o->{users}} ] },
{ label => _("Choose the window manager to run:"), val => \$o->{desktop}, list => \@wm }, ]) or delete $o->{autologin};
}
}
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 41de68d6d..9d1e9cbc2 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -918,13 +918,12 @@ sub addUser {
if (($o->{security} >= 1 || $clicked)) {
any::ask_users($o->{prefix}, $o, $o->{users}, $o->{security});
}
+ any::get_autologin($o->{prefix}, $o);
+ any::autologin($o->{prefix}, $o, $o);
+
install_steps::addUser($o);
}
-# any::get_autologin($o->{prefix}, $o);
-
-
-
#------------------------------------------------------------------------------
sub createBootdisk {
my ($o, $first_time) = @_;