summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-08-21 14:52:33 +0000
committerOlivier Blin <oblin@mandriva.com>2007-08-21 14:52:33 +0000
commit93810de8906bd9decf0e2d34bdaf429a415517d5 (patch)
tree74deed7b4a622533d1e62efab72c6c315913b806 /perl-install
parentc5ccb2d05f93ccdaf9f61df92fd603c2dba4993c (diff)
downloaddrakx-93810de8906bd9decf0e2d34bdaf429a415517d5.tar
drakx-93810de8906bd9decf0e2d34bdaf429a415517d5.tar.gz
drakx-93810de8906bd9decf0e2d34bdaf429a415517d5.tar.bz2
drakx-93810de8906bd9decf0e2d34bdaf429a415517d5.tar.xz
drakx-93810de8906bd9decf0e2d34bdaf429a415517d5.zip
use '_' in IDE module names
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/detect_devices.pm2
-rw-r--r--perl-install/modules.pm4
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index b58768f95..c66706858 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -61,7 +61,7 @@ sub floppies {
}
}
- my @ide = ls120s() and eval { modules::load("ide-floppy") };
+ my @ide = ls120s() and eval { modules::load("ide_floppy") };
eval { modules::load("usb_storage") } if $::isInstall && usbStorage();
my @scsi = grep { $_->{media_type} eq 'fd' } getSCSI();
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 01a88a18c..9b31904df 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -161,7 +161,7 @@ sub load_category {
$_->{try} = 1 if member($_->{driver}, 'hptraid', 'ohci1394'); #- do not warn when this fails
}
- eval { load_and_configure($conf, 'ide-generic') } if $category eq 'disk/ide';
+ eval { load_and_configure($conf, 'ide_generic') } if $category eq 'disk/ide';
grep { !($_->{error} && $_->{try}) } @l;
}
@@ -261,7 +261,7 @@ sub when_load_category {
if ($category =~ m,disk/ide,) {
$conf->add_probeall('ide-controller', $name);
- eval { load('ide-disk') };
+ eval { load('ide_disk') };
} elsif ($category =~ m,disk/(scsi|hardware_raid|sata|usb|firewire),) {
$conf->add_probeall('scsi_hostadapter', $name);
eval { load('sd_mod') };