diff options
Diffstat (limited to 'perl-install/modalias.pm')
| -rw-r--r-- | perl-install/modalias.pm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/perl-install/modalias.pm b/perl-install/modalias.pm index 516a2dd01..e1b61edc0 100644 --- a/perl-install/modalias.pm +++ b/perl-install/modalias.pm @@ -13,6 +13,8 @@ my @config_groups = ( "/etc/modprobe.conf", "/etc/modprobe.d", ], +); +my @system_groups = ( [ "/lib/module-init-tools/ldetect-lst-modules.alias", ], @@ -43,8 +45,8 @@ sub parse_path { } elsif (-f $path) { foreach (cat_($path)) { if (my ($alias, $class, $module) = $_ =~ $alias_re) { - my ($vendor, $device) = alias_to_ids($alias); if (member($class, @classes)) { + my ($vendor, $device) = alias_to_ids($alias); if ($vendor) { $group->{$class} ||= {}; $group->{$class}{$vendor} ||= {}; @@ -70,23 +72,25 @@ sub parse_file_modules { \%modules; } -sub get_alias_groups() { +sub get_alias_groups { + my ($o_skip_config) = @_; + #- FIXME: only o_skip_config from the first call is considered @alias_groups = map { my $group = {}; parse_path($group, $_) foreach @$_; $group; - } @config_groups unless @alias_groups; + } if_(!$o_skip_config, @config_groups), @system_groups unless @alias_groups; @alias_groups; } sub get_modules { - my ($modalias) = @_; + my ($modalias, $o_skip_config) = @_; my ($class) = $modalias =~ /^([^:]+):\S+$/; my ($vendor, $device) = alias_to_ids($modalias); $class && member($class, @classes) or return; require File::FnMatch; - foreach my $group (get_alias_groups()) { + foreach my $group (get_alias_groups($o_skip_config)) { my @aliases; foreach my $subgroup ($group->{$class}{$vendor}{$device}, $group->{$class}{other}) { foreach (group_by2(@$subgroup)) { |