summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-16 22:00:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-16 22:00:54 +0000
commita8b73def5ea962a0438c9b3058b626630dbe444c (patch)
treeb13f07cc1612dfc90238bec521ad08c2705ca012 /perl-install/install_steps_interactive.pm
parentcbbd8617c7756c82b57544add01c777501ed944e (diff)
downloaddrakx-backup-do-not-use-a8b73def5ea962a0438c9b3058b626630dbe444c.tar
drakx-backup-do-not-use-a8b73def5ea962a0438c9b3058b626630dbe444c.tar.gz
drakx-backup-do-not-use-a8b73def5ea962a0438c9b3058b626630dbe444c.tar.bz2
drakx-backup-do-not-use-a8b73def5ea962a0438c9b3058b626630dbe444c.tar.xz
drakx-backup-do-not-use-a8b73def5ea962a0438c9b3058b626630dbe444c.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm9
1 files changed, 6 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d679ca432..5b4930a91 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -278,6 +278,7 @@ sub choosePartitionsToFormat($$) {
return if $::beginner && 0 == grep { ! $_->{toFormat} } @l;
+ #- keep it temporary until the guy has accepted
my %toFormat = map { $_ => $_->{toFormat} || $_->{toFormatUnsure} } @l;
my %label;
@@ -290,11 +291,13 @@ sub choosePartitionsToFormat($$) {
$o->ask_many_from_list_ref('', _("Choose the partitions you want to format"),
[ map { $label{$_} } @l ],
[ map { \$toFormat{$_} } @l ]) or die "cancel";
+ #- ok now we can really set toFormat
+ $_->{toFormat} = $toFormat{$_} foreach @l;
+
@l = grep { $_->{toFormat} && !isLoopback($_) && !isReiserfs($_) } @l;
$o->ask_many_from_list_ref('', _("Check bad blocks?"),
[ map { $label{$_} } @l ],
[ map { \$_->{toFormatCheck} } @l ]) or goto &choosePartitionsToFormat if $::expert;
- $_->{toFormat} = $toFormat{$_} foreach @l;
}
@@ -583,9 +586,9 @@ sub configurePrinter {
$::expert or $o->{printer}{mode} ||= 'CUPS';
if ($::expert || !$o->{printer}{mode}) {
$o->{printer}{mode} = $o->ask_from_list_([''], _("Which printing system do you want to use?"),
- [ 'CUPS', 'lpr', __("Cancel") ],
+ [ 'CUPS', 'lpr', __("None") ],
);
- $o->{printer}{want} = $o->{printer}{mode} ne 'Cancel';
+ $o->{printer}{want} = $o->{printer}{mode} ne 'None';
$o->{printer}{want} or $o->{printer}{mode} = undef, return;
}