summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-08-01 00:43:29 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-08-01 00:43:29 +0000
commitbdf21fd3a04d47a91e2bf1d920f86c84138742e0 (patch)
tree2bfbd21e751e1a8da4ae6722ad9529219c8f4cb9
parent69dd828cf65886ada7ede22c495d14f84c8c593a (diff)
downloaddrakx-bdf21fd3a04d47a91e2bf1d920f86c84138742e0.tar
drakx-bdf21fd3a04d47a91e2bf1d920f86c84138742e0.tar.gz
drakx-bdf21fd3a04d47a91e2bf1d920f86c84138742e0.tar.bz2
drakx-bdf21fd3a04d47a91e2bf1d920f86c84138742e0.tar.xz
drakx-bdf21fd3a04d47a91e2bf1d920f86c84138742e0.zip
no_comment
-rw-r--r--perl-install/Xconfigurator.pm10
1 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index de90d04fe..0af8531c8 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -1074,15 +1074,13 @@ Would you like X to start when you reboot?"), 1);
$l{uid} > 500, $l{name};
} cat_("$o->{prefix}/etc/passwd");
- if (exists $o->{miscellaneous}{autologuser} || $::auto || !@users
- || $in->ask_yesorno(_("Autologin at startup"),
+ exists $o->{miscellaneous}{autologuser} || $::auto || !@users or
+ $in->ask_yesorno(_("Autologin at startup"),
_("I can set up your computer to automatically log on one user.
-Would you like to use this feature?"), 1)) {
- $in->ask_from_entries_refH(_("Autologin"),
- _("Autologin - Choose default user\n"),
+Would you like to use this feature?"), 1) && $in->ask_from_entries_refH(_("Autologin"),
+ _("Autologin - Choose default user"),
[ _("Choose the default user :") => {val => \$o->{miscellaneous}{autologuser}, list => \@users, not_edit => 1} ],
);
- }
}
run_program::rooted($prefix, "chkconfig", "--del", "gpm") if $o->{mouse}{device} =~ /ttyS/ && !$::isStandalone;
}