summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-03-06 17:29:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-03-06 17:29:20 +0000
commitda9db0885056824985194b1ff95d571c8a97beb7 (patch)
tree7134815ad411617eb46e5ab7250a4a335e09168e
parent6f5274d7bf6f99478085f0f012d98bf8c21ca6f1 (diff)
downloaddrakx-da9db0885056824985194b1ff95d571c8a97beb7.tar
drakx-da9db0885056824985194b1ff95d571c8a97beb7.tar.gz
drakx-da9db0885056824985194b1ff95d571c8a97beb7.tar.bz2
drakx-da9db0885056824985194b1ff95d571c8a97beb7.tar.xz
drakx-da9db0885056824985194b1ff95d571c8a97beb7.zip
(summary): fixes
(setupSCSI): cleanup
-rw-r--r--perl-install/install_steps_interactive.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 905834cb3..ee83a25f0 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -258,7 +258,7 @@ sub selectMouse {
}
#------------------------------------------------------------------------------
sub setupSCSI {
- my ($o) = @_;
+ my ($o, $auto, $at_least_one) = @_;
if ($o->{pcmcia} && !$::noauto) {
my $w = $o->wait_message(_("PCMCIA"), _("Configuring PCMCIA cards..."));
@@ -268,7 +268,7 @@ sub setupSCSI {
my $w = $o->wait_message(_("IDE"), _("Configuring IDE"));
modules::load_ide();
}
- any::setup_thiskind($o, 'scsi|disk', $_[1], $_[2], $o->{pcmcia});
+ any::setup_thiskind($o, 'scsi|disk', $auto, $at_least_one, $o->{pcmcia});
}
sub ask_mntpoint_s {
@@ -747,10 +747,10 @@ sub summary {
} modules::get_that_type('sound')),
(map {
{ label => _("TV card"), val => \ (my $i = $_->{description}), clicked => {} }
- } { $_->{driver} eq 'bttv' } detect_devices::probeall()),
+ } grep { $_->{driver} eq 'bttv' } detect_devices::probeall()),
(map {
{ label => _("ISDN card"), val => \ (my $i = $_->{description}), clicked => { $o->configureNetwork } }
- } { $_->{driver} eq 'hisax' } detect_devices::probeall()),
+ } grep { $_->{driver} eq 'hisax' } detect_devices::probeall()),
]);
}