summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-20 23:50:29 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-20 23:50:29 +0000
commitff2dcb0c7222726aa7ff574311b8951e42a01907 (patch)
treeaee87b98512d08c12d5c66f4576ccfa9ece2ce61
parent6be639a74eba496768c109adc5d767974526f59e (diff)
downloaddrakx-ff2dcb0c7222726aa7ff574311b8951e42a01907.tar
drakx-ff2dcb0c7222726aa7ff574311b8951e42a01907.tar.gz
drakx-ff2dcb0c7222726aa7ff574311b8951e42a01907.tar.bz2
drakx-ff2dcb0c7222726aa7ff574311b8951e42a01907.tar.xz
drakx-ff2dcb0c7222726aa7ff574311b8951e42a01907.zip
- ugly hack to temporary handle reading ide_cd in /proc/modules whereas we
insmoded ide-cd - removing load_ide() (unused)
-rw-r--r--perl-install/modules.pm6
1 files changed, 1 insertions, 5 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 8252057ce..09dc9fcc4 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -39,7 +39,7 @@ sub load {
dependencies_closure($name);
} @_;
- @l = difference2([ uniq(@l) ], [ loaded_modules() ]) or return;
+ @l = difference2([ uniq(@l) ], [ map { my $s = $_; $s =~ s/_/-/g; $s, $_ } loaded_modules() ]) or return;
my $network_module = do {
my ($network_modules, $other) = partition { module2category($_) =~ m,network/(main|gigabit|usb), } @l;
@@ -129,10 +129,6 @@ sub probe_category {
} detect_devices::probeall();
}
-sub load_ide() {
- eval { load("ide-cd") }
-}
-
#-###############################################################################
#- modules.conf functions