diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-10-04 00:30:29 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-10-04 00:30:29 +0000 |
| commit | 1237406e5ee90da9dbdfec9fce21d603f75c80a6 (patch) | |
| tree | f9b071d99afeccf9ef1c029cd08724b24919d91f /perl-install/modules.pm | |
| parent | a8fff3fb88fd5d727ab14812673dbed47541593e (diff) | |
| download | drakx-backup-do-not-use-1237406e5ee90da9dbdfec9fce21d603f75c80a6.tar drakx-backup-do-not-use-1237406e5ee90da9dbdfec9fce21d603f75c80a6.tar.gz drakx-backup-do-not-use-1237406e5ee90da9dbdfec9fce21d603f75c80a6.tar.bz2 drakx-backup-do-not-use-1237406e5ee90da9dbdfec9fce21d603f75c80a6.tar.xz drakx-backup-do-not-use-1237406e5ee90da9dbdfec9fce21d603f75c80a6.zip | |
no_comment
Diffstat (limited to 'perl-install/modules.pm')
| -rw-r--r-- | perl-install/modules.pm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 909b09844..5f00af56b 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -408,7 +408,7 @@ sub remove_alias($) { sub when_load { my ($name, $type, @options) = @_; - if ($type =~ /scsi/ || $type eq $type_aliases{scsi}) { + if ($type =~ /\bscsi\b/ || $type eq $type_aliases{scsi}) { add_alias('scsi_hostadapter', $name), eval { load('sd_mod') }; } $conf{$name}{options} = join " ", @options if @options; @@ -612,13 +612,15 @@ sub get_that_type { } sub load_ide { - return; #- add it back to support Ultra66 on ide modules. - eval { - load("ide-mod", 'prereq', 'options="' . detect_devices::hasUltra66() . '"'); - delete $conf{"ide-mod"}{options}; - load_multi(qw(ide-probe ide-probe-mod ide-disk ide-cd)); + if (1) { #- add it back to support Ultra66 on ide modules. + load("ide-cd"); + } else { + eval { + load("ide-mod", 'prereq', 'options="' . detect_devices::hasUltra66() . '"'); + delete $conf{"ide-mod"}{options}; + load_multi(qw(ide-probe ide-probe-mod ide-disk ide-cd)); + } } - } sub configure_pcmcia { |