summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-03-14 09:25:40 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-03-14 09:25:40 +0000
commite2cbffc6422fc59ee624c2c399e79109c21c7cc4 (patch)
tree8bc16a2c6a23da765f7bd7ca08b5ad5dc676b6c5 /perl-install/install_steps_interactive.pm
parent9266168309a593e84c47cc59edb2a6ccd49e4686 (diff)
downloaddrakx-e2cbffc6422fc59ee624c2c399e79109c21c7cc4.tar
drakx-e2cbffc6422fc59ee624c2c399e79109c21c7cc4.tar.gz
drakx-e2cbffc6422fc59ee624c2c399e79109c21c7cc4.tar.bz2
drakx-e2cbffc6422fc59ee624c2c399e79109c21c7cc4.tar.xz
drakx-e2cbffc6422fc59ee624c2c399e79109c21c7cc4.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm9
1 files changed, 3 insertions, 6 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 3fa598da9..832b2c52d 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -153,7 +153,7 @@ sub selectMouse {
[ mouse::serial_ports_names() ]));
}
- $o->setup_thiskind('serial_usb', !$::expert, 0) if $o->{mouse}{device} eq "usbmouse";
+ $o->setup_thiskind('SERIAL_USB', !$::expert, 0) if $o->{mouse}{device} eq "usbmouse";
$o->SUPER::selectMouse;
}
@@ -218,7 +218,7 @@ sub choosePartitionsToFormat($$) {
$o->ask_many_from_list_ref('', _("Choose the partitions you want to format"),
[ map { $label{$_} } @l ],
[ map { \$_->{toFormat} } @l ]) or die "cancel";
- @l = grep { $_->{toFormat} } @l;
+ @l = grep { $_->{toFormat} && !isLoopback($_) } @l;
$o->ask_many_from_list_ref('', _("Check bad blocks?"),
[ map { $label{$_} } @l ],
[ map { \$_->{toFormatCheck} } @l ]) or goto &choosePartitionsToFormat if $::expert;
@@ -269,10 +269,7 @@ sub choosePackages {
$o->chooseGroups($packages, $compssUsers, $compssUsersSorted);
- my %save_selected; $save_selected{$_->{file}} = pkgs::packageFlagSelected($_) foreach values %{$packages->[0]};
- pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, 1, 0, $o->{installClass});
- my $max_size = pkgs::selectedSize($packages);
- pkgs::packageSetFlagSelected($_, $save_selected{$_->{file}}) foreach values %{$packages->[0]};
+ my $max_size = int (sum map { pkgs::packageSize($_) } values %{$packages->[0]});
if (!$::beginner && $max_size > $available) {
$o->ask_okcancel('',