summaryrefslogtreecommitdiffstats
path: root/perl-install/modules.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-08-20 13:50:40 +0000
committerOlivier Blin <oblin@mandriva.com>2007-08-20 13:50:40 +0000
commitb9fbf633ffa6d2a4fe86b789c81e4780cab0ffc1 (patch)
tree3f2ae7535c8325f687bb34f739b1fce9db35b413 /perl-install/modules.pm
parent7d7850aa75e8dc191b724df115c04109de83598d (diff)
downloaddrakx-backup-do-not-use-b9fbf633ffa6d2a4fe86b789c81e4780cab0ffc1.tar
drakx-backup-do-not-use-b9fbf633ffa6d2a4fe86b789c81e4780cab0ffc1.tar.gz
drakx-backup-do-not-use-b9fbf633ffa6d2a4fe86b789c81e4780cab0ffc1.tar.bz2
drakx-backup-do-not-use-b9fbf633ffa6d2a4fe86b789c81e4780cab0ffc1.tar.xz
drakx-backup-do-not-use-b9fbf633ffa6d2a4fe86b789c81e4780cab0ffc1.zip
use '_' in modules names
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r--perl-install/modules.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 053d9988e..9e1cd537a 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -12,7 +12,7 @@ use modules::any_conf;
sub modules_descriptions() {
my $f = '/lib/modules/' . c::kernel_version() . '/modules.description';
-e $f or $f = '/modules/modules.description';
- map { /(\S+)\s+(.*)/ } cat_($f);
+ map { my ($m, $d) = /(\S+)\s+(.*)/; $m =~ s/-/_/g; ($m => $d) } cat_($f);
}
sub module2description { +{ modules_descriptions() }->{$_[0]} }
@@ -24,9 +24,9 @@ sub category2modules_and_description {
}
my %mappings_24_26 = (
- "usb-ohci" => "ohci-hcd",
- "usb-uhci" => "uhci-hcd",
- "uhci" => "uhci-hcd",
+ "usb_ohci" => "ohci_hcd",
+ "usb_uhci" => "uhci_hcd",
+ "uhci" => "uhci_hcd",
"printer" => "usblp",
"bcm4400" => "b44",
"3c559" => "3c359",
@@ -34,7 +34,7 @@ my %mappings_24_26 = (
"dc395x_trm" => "dc395x",
);
my %mappings_26_24 = reverse %mappings_24_26;
-$mappings_26_24{'uhci-hcd'} = 'usb-uhci';
+$mappings_26_24{'uhci_hcd'} = 'usb_uhci';
sub mapping_24_26 {
my ($modname) = @_;