summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-01-09 23:33:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-01-09 23:33:49 +0000
commit61a67f8c11d7731ffbd8a3463dac8f2c1bf8fda9 (patch)
treea314c121bbd0a1bd39d4ecff48f82d37a6c75cfa
parent60c149d28cdd9b8730890fa790c43b79f8409cb3 (diff)
downloaddrakx-backup-do-not-use-61a67f8c11d7731ffbd8a3463dac8f2c1bf8fda9.tar
drakx-backup-do-not-use-61a67f8c11d7731ffbd8a3463dac8f2c1bf8fda9.tar.gz
drakx-backup-do-not-use-61a67f8c11d7731ffbd8a3463dac8f2c1bf8fda9.tar.bz2
drakx-backup-do-not-use-61a67f8c11d7731ffbd8a3463dac8f2c1bf8fda9.tar.xz
drakx-backup-do-not-use-61a67f8c11d7731ffbd8a3463dac8f2c1bf8fda9.zip
(choosePartitionsToFormat): handle "check for bad blocks" as advanced
(setRootPassword): remove choosing non-md5 or non-shadow passwords.
-rw-r--r--perl-install/install_steps_interactive.pm77
1 files changed, 37 insertions, 40 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 58de5c5d1..4ca51cb53 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -50,10 +50,22 @@ sub kill_action {
sub selectLanguage($) {
my ($o) = @_;
- $o->ask_from_entries_refH("Language",
- _("Please, choose a language to use."),
- [ { val => \$o->{lang}, type => 'list',
- format => \&lang::lang2text, list => [ lang::list() ] } ]);
+ $o->ask_from_entries_refH(
+ { messages => _("Please, choose a language to use."),
+ advanced_messages => _("You can choose other languages that will be available after install"),
+ callbacks => {
+ changed => sub { $o->{langs}{$o->{lang}} = 1 },
+ },
+ },
+ [ { val => \$o->{lang}, type => 'list',
+ format => \&lang::lang2text, list => [ lang::list() ] },
+ (map {;
+ { val => \$o->{langs}{$_}, type => 'bool', disabled => sub { $o->{langs}{all} },
+ text => lang::lang2text($_)
+ }
+ } lang::list()),
+ { val => \$o->{langs}{all}, type => 'bool', text => _("All") }
+ ]);
install_steps::selectLanguage($o);
@@ -158,21 +170,6 @@ sub selectKeyboard($) {
list => [ keyboard::xmodmaps() ] } ]);
delete $o->{keyboard_unsafe};
- if ($::expert && ref($o) !~ /newt/) { #- newt is buggy with big windows :-(
- $o->set_help('selectLangs');
- $o->{langs} ||= [ $o->{lang} ];
- my $all = member('all', @{$o->{langs}});
- my $l = $o->ask_many_from_list('',
- _("You can choose other languages that will be available after install"),
- {
- list => [ lang::list() ],
- label => sub { lang::lang2text($_) },
- values => $o->{langs},
- sort => 1,
- },
- { list => ['all'], label => sub { _("All") }, ref => sub { \$all }, shadow => 0 }) or goto &selectKeyboard;
- $o->{langs} = [ $all ? 'all' : $l ];
- }
install_steps::selectKeyboard($o);
}
#------------------------------------------------------------------------------
@@ -348,7 +345,7 @@ Continue at your own risk!"));
}
#------------------------------------------------------------------------------
-sub rebootNeeded($) {
+sub rebootNeeded {
my ($o) = @_;
$o->ask_warn('', _("You need to reboot for the partition table modifications to take place"));
@@ -356,7 +353,7 @@ sub rebootNeeded($) {
}
#------------------------------------------------------------------------------
-sub choosePartitionsToFormat($$) {
+sub choosePartitionsToFormat {
my ($o, $fstab) = @_;
$o->SUPER::choosePartitionsToFormat($fstab);
@@ -374,22 +371,25 @@ sub choosePartitionsToFormat($$) {
};
#- keep it temporary until the guy has accepted
- my $toFormat = $o->ask_many_from_list('', _("Choose the partitions you want to format"),
- {
- list => \@l,
- label => $name2label,
- value => sub { $_->{toFormat} || $_->{toFormatUnsure} },
- }) or die "already displayed";
+ $_->{toFormatTmp} = $_->{toFormat} || $_->{toFormatUnsure} foreach @l;
+
+ $o->ask_from_entries_refH_powered(
+ { messages => _("Choose the partitions you want to format"),
+ advanced_messages => _("Check bad blocks?"),
+ },
+ [ map {
+ my $e = $_;
+ ({
+ text => $name2label->($e), type => 'bool',
+ val => \$e->{toFormatTmp}
+ }, {
+ text => $name2label->($e), type => 'bool', advanced => 1,
+ disabled => sub { !$e->{toFormatTmp} },
+ val => \$e->{toFormatCheck}
+ }) } grep { !isLoopback($_) && !isReiserfs($_) } @l ]
+ ) or die 'already displayed';
#- ok now we can really set toFormat
- $_->{toFormat} = 1 foreach @$toFormat;
-
- my @m = grep { $_->{toFormat} && !isLoopback($_) && !isReiserfs($_) } @l;
- !@m || $o->ask_many_from_list('', _("Check bad blocks?"),
- {
- list => \@m,
- label => $name2label,
- ref => sub { \$_->{toFormatCheck} },
- }) or goto &choosePartitionsToFormat if $::expert;
+ $_->{toFormat} = delete $_->{toFormatTmp} foreach @l;
}
@@ -766,10 +766,7 @@ sub setRootPassword {
} } }, [
{ label => _("Password"), val => \$sup->{password}, hidden => 1 },
{ label => _("Password (again)"), val => \$sup->{password2}, hidden => 1 },
- if_($o->{installClass} eq "server" || $::expert,
-{ label => _("Use shadow file"), val => \$o->{authentication}{shadow}, type => 'bool', text => _("shadow") },
-{ label => _("Use MD5 passwords"), val => \$o->{authentication}{md5}, type => 'bool', text => _("MD5") },
- ), if_(!$::beginner,
+ if_(!$::beginner,
{ label => _("Use NIS"), val => \$nis, type => 'bool', text => _("yellow pages") },
),
]) or return;