summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-05-03 16:16:48 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-05-03 16:16:48 +0000
commite9dbe54ed4f656c59e7a0c0a914bc427e8d739e2 (patch)
tree73caec78b928343196a8310b960eb5a819c7f08a
parentb5b5d539112817788a0321f9ce444547a9c77f75 (diff)
downloaddrakx-backup-do-not-use-e9dbe54ed4f656c59e7a0c0a914bc427e8d739e2.tar
drakx-backup-do-not-use-e9dbe54ed4f656c59e7a0c0a914bc427e8d739e2.tar.gz
drakx-backup-do-not-use-e9dbe54ed4f656c59e7a0c0a914bc427e8d739e2.tar.bz2
drakx-backup-do-not-use-e9dbe54ed4f656c59e7a0c0a914bc427e8d739e2.tar.xz
drakx-backup-do-not-use-e9dbe54ed4f656c59e7a0c0a914bc427e8d739e2.zip
no_comment
-rw-r--r--perl-install/install_steps_interactive.pm7
-rw-r--r--perl-install/modules.pm6
2 files changed, 6 insertions, 7 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d170dd31b..dadbcec8b 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1124,7 +1124,7 @@ _("Loading module %s failed.
Do you want to try again with other parameters?", $l), 1) or return;
goto ASK;
}
- $l, $m;
+ $l;
}
#------------------------------------------------------------------------------
@@ -1153,7 +1153,7 @@ sub setup_thiskind {
}
while (1) {
my $msg = @l ?
- [ _("Found %s %s interfaces", join(", ", map { $_->[0] } @l), $type),
+ [ _("Found %s %s interfaces", join(", ", @l), $type),
_("Do you have another one?") ] :
_("Do you have any %s interfaces?", $type);
@@ -1163,8 +1163,7 @@ sub setup_thiskind {
$r = $o->ask_from_list_('', $msg, $opt, "No") unless $at_least_one && @l == 0;
if ($r eq "No") { return }
elsif ($r eq "Yes") {
- my @r = $o->load_module($type) or return;
- push @l, \@r;
+ push @l, $o->load_module($type) || return;
} else {
#-eval { commands::modprobe("isapnp") };
require pci_probing::main;
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 3cd097bc4..bd3cb81ef8 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -541,18 +541,18 @@ sub load_thiskind($;&$) {
#- probe for USB SCSI.
if (my ($c) = grep { /usb-/ } map { $_->[1] } pci_probing::main::probe('')) {
eval { load($c, "SERIAL_USB"); load("usb-storage", $type); sleep(1); };
- -d "/proc/scsi/usb" ? push(@devs, [ "usb-storage", "usb-storage" ]) : unload("usb-storage");
+ -d "/proc/scsi/usb" or unload("usb-storage");
}
#- probe for parport SCSI.
foreach ("imm", "ppa") {
- eval { load($_, $type); push @devs, [ $_, $_ ] };
+ eval { load($_, $type) };
last if !$@;
}
if (my ($c) = pci_probing::main::probe('AUDIO')) {
add_alias("sound", $c->[1]) if pci_probing::main::check($c->[1]);
}
}
- @devs, map { [ $_, $_ ] } @{$loaded{$type} || []};
+ @{$loaded{$type} || []};
}
sub pcmcia_need_config($) {