diff options
| -rw-r--r-- | perl-install/ChangeLog | 4 | ||||
| -rw-r--r-- | perl-install/Xconfigurator.pm | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index b65b692a5..190657486 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,7 @@ +2000-09-19 dam's <damien@mandrakesoft.com> + + * Xconfigurator.pm (autologin): corrected @users definition. + 2000-09-19 Pixel <pixel@mandrakesoft.com> * many files: changed some access to get_root to get_root_ diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 49a3afc85..f098ca3b9 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -1092,20 +1092,19 @@ _("I can set up your computer to automatically start X upon booting. Would you like X to start when you reboot?"), 1); rewriteInittab($run ? 5 : 3) unless $::testing; } - my @etc_pass_fields = qw(name pw uid gid realname home shell); - my @users = mapgrep { - my %l; @l{@etc_pass_fields} = split ':'; - $l{uid} > 500, $l{name}; - } cat_("$o->{prefix}/etc/passwd"); - - autologin($prefix, $o, $in, $allowFB, $isLaptop, $install, @users); + autologin($prefix, $o, $in, $allowFB, $isLaptop, $install); } } sub autologin { my ($o, $allowFB); - ($prefix, $o, $in, $allowFB, $isLaptop, $install, @users) = @_; + ($prefix, $o, $in, $allowFB, $isLaptop, $install) = @_; $o ||= {}; + my @etc_pass_fields = qw(name pw uid gid realname home shell); + my @users = mapgrep { + my %l; @l{@etc_pass_fields} = split ':'; + $l{uid} > 500, $l{name}; + } cat_("$o->{prefix}/etc/passwd"); unless (($::auto && $o->{skiptest}) || !@users || $o->{authentication}{NIS}) { my $cmd = $prefix ? "chroot $prefix" : ""; my @wm = (split (' ', `$cmd /usr/sbin/chksession -l`)); |