summaryrefslogtreecommitdiffstats
path: root/perl-install/modules.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-05-04 18:31:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-05-04 18:31:12 +0000
commit4e096379cad750ecfdb7ddd78eeae899380a7696 (patch)
treed8d20a99442163647d9daac826478cb5695f4312 /perl-install/modules.pm
parenta653f2e1d6d6ff8ee49c647e747bdb5b549429c2 (diff)
downloaddrakx-backup-do-not-use-4e096379cad750ecfdb7ddd78eeae899380a7696.tar
drakx-backup-do-not-use-4e096379cad750ecfdb7ddd78eeae899380a7696.tar.gz
drakx-backup-do-not-use-4e096379cad750ecfdb7ddd78eeae899380a7696.tar.bz2
drakx-backup-do-not-use-4e096379cad750ecfdb7ddd78eeae899380a7696.tar.xz
drakx-backup-do-not-use-4e096379cad750ecfdb7ddd78eeae899380a7696.zip
no_comment
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r--perl-install/modules.pm23
1 files changed, 13 insertions, 10 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 60d9d201c..024936c28 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -137,6 +137,7 @@ arch() =~ /^sparc/ ? (
"sd_mod" => "sd_mod",
"ide-mod" => "ide-mod",
"ide-probe" => "ide-probe",
+ "ide-probe-mod" => "ide-probe-mod",
}],
[ 'disk', {
arch() =~ /^sparc/ ? (
@@ -158,15 +159,15 @@ arch() =~ /^sparc/ ? (
}],
[ 'cdrom', {
arch() !~ /^sparc/ ? (
-#- "sbpcd" => "SoundBlaster/Panasonic", #- removed for space
- "aztcd" => "Aztech CD",
- "gscd" => "Goldstar R420",
- "isp16" => "ISP16/MAD16/Mozart",
+ "sbpcd" => "SoundBlaster/Panasonic",
+#- "aztcd" => "Aztech CD",
+#- "gscd" => "Goldstar R420",
+#- "isp16" => "ISP16/MAD16/Mozart",
#- "mcd" => "Mitsumi", #- removed for space
- "mcdx" => "Mitsumi (alternate)",
- "optcd" => "Optics Storage 8000",
- "cm206" => "Phillips CM206/CM260",
- "sjcd" => "Sanyo",
+#- "mcdx" => "Mitsumi (alternate)",
+#- "optcd" => "Optics Storage 8000",
+#- "cm206" => "Phillips CM206/CM260",
+#- "sjcd" => "Sanyo",
"cdu31a" => "Sony CDU-31A",
"sonycd535" => "Sony CDU-5xx",
) : (),
@@ -447,9 +448,11 @@ sub load_raw {
}
sub read_already_loaded() {
- foreach (cat_("/proc/modules", "die")) {
+ foreach (cat_("/proc/modules")) {
my ($name) = split;
$conf{$name}{loaded} = 1;
+ my $l = $loaded{($drivers{$name} || next)->{type}} ||= [];
+ push @$l, $name unless member($name, @$l);
}
}
@@ -603,6 +606,6 @@ sub load_ide {
eval {
load("ide-mod", 'prereq', 'options="' . detect_devices::hasUltra66() . '"');
delete $conf{"ide-mod"}{options};
- load_multi(qw(ide-probe ide-disk ide-cd));
+ load_multi(qw(ide-probe ide-probe-mod ide-disk ide-cd));
}
}