summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/ChangeLog5
-rw-r--r--perl-install/Xconfigurator.pm34
2 files changed, 24 insertions, 15 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index da0506932..ea247c712 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,5 +1,10 @@
2000-09-18 Pixel <pixel@mandrakesoft.com>
+ * Xconfigurator (autologin): do it eve, if newbie. Autologin is
+ now in separated function.
+
+2000-09-18 Pixel <pixel@mandrakesoft.com>
+
* Xconfigurator.pm (testFinalConfig): don't skip the test in auto
if called via "Test again"
* Xconfigurator.pm (resolutionsConfiguration): ensure all depth
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 06e8afe18..999ff1919 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -1172,22 +1172,26 @@ Would you like X to start when you reboot?"), 1);
$l{uid} > 500, $l{name};
} cat_("$o->{prefix}/etc/passwd");
- unless ($::auto || !@users || $o->{authentication}{NIS}) {
- my $cmd = $prefix ? "chroot $prefix" : "";
- my @wm = (split (' ', `$cmd /usr/sbin/chksession -l`));
-
- my %l = getVarsFromSh("$prefix/etc/sysconfig/autologin");
- $o->{autologin} ||= $l{USER};
+ autologin($prefix, $o, $in, $allowFB, $isLaptop, $install);
+ }
+}
- $in->ask_from_entries_refH(_("Autologin"),
-_("I can set up your computer to automatically log on one user.
+sub autologin {
+ my ($o, $allowFB);
+ ($prefix, $o, $in, $allowFB, $isLaptop, $install) = @_;
+ $o ||= {};
+ unless (($::auto && $o->{skiptest}) || !@users || $o->{authentication}{NIS}) {
+ my $cmd = $prefix ? "chroot $prefix" : "";
+ my @wm = (split (' ', `$cmd /usr/sbin/chksession -l`));
+ my %l = getVarsFromSh("$prefix/etc/sysconfig/autologin");
+ $o->{autologin} ||= $l{USER};
+ $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."),
- [ _("Choose the default user:") => { val => \$o->{autologin}, list => [ '', @users ] },
- _("Choose the window_manager to run:") => { val => \$o->{desktop}, list => \@wm }, ]) or delete $o->{autologin};
- }
- $o->{autologin} and $::isStandalone ? system("urpmi --auto autologin") : $::o->pkg_install("autologin");
- any::setAutologin($prefix, $o->{autologin}, $o->{desktop});
-
- run_program::rooted($prefix, "chkconfig", "--del", "gpm") if $o->{mouse}{device} =~ /ttyS/ && !$::isStandalone;
+ [ _("Choose the default user:") => { val => \$o->{autologin}, list => [ '', @users ] },
+ _("Choose the window_manager to run:") => { val => \$o->{desktop}, list => \@wm }, ]) or delete $o->{autologin};
}
+ $o->{autologin} and $install->('autologin');
+ any::setAutologin($prefix, $o->{autologin}, $o->{desktop});
+ run_program::rooted($prefix, "chkconfig", "--del", "gpm") if $o->{mouse}{device} =~ /ttyS/ && !$::isStandalone;
}