summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-06-09 11:41:34 +0000
committerFrancois Pons <fpons@mandriva.com>2000-06-09 11:41:34 +0000
commit5ea167189175406cc0267db0ba9edb00b27538ff (patch)
tree8a9829f234edfe8adff3c4ca4f3ebac2d70c4615
parentfa053ef2006a77d47c483a9677bfb174c59db6bd (diff)
downloaddrakx-5ea167189175406cc0267db0ba9edb00b27538ff.tar
drakx-5ea167189175406cc0267db0ba9edb00b27538ff.tar.gz
drakx-5ea167189175406cc0267db0ba9edb00b27538ff.tar.bz2
drakx-5ea167189175406cc0267db0ba9edb00b27538ff.tar.xz
drakx-5ea167189175406cc0267db0ba9edb00b27538ff.zip
*** empty log message ***
-rw-r--r--perl-install/modules.pm9
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index c1bdb2cfc..e3d893821 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -388,10 +388,7 @@ sub load {
if ($type) {
add_alias('usb-interface', $name) if $type =~ /SERIAL_USB/i;
- if ($type eq "scsi" || $type eq $type_aliases{scsi}) {
- add_alias('scsi_hostadapter', $name);
- load("sd_mod");
- }
+ add_alias('scsi_hostadapter', $name) if $type eq "scsi" || $type eq $type_aliases{scsi};
}
$conf{$name}{options} = join " ", @options if @options;
}
@@ -573,7 +570,9 @@ sub load_thiskind($;&$) {
add_alias("sound", $c->[1]) if pci_probing::main::check($c->[1]);
}
}
- map { $loaded_text{$_} || $_ } @{$loaded{$type} || []};
+ my @loaded = map { $loaded_text{$_} || $_ } @{$loaded{$type} || []};
+ $type eq 'scsi' and @loaded and eval { load("sd_mod") };
+ @loaded;
}
sub pcmcia_need_config($) {