diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-07 06:47:22 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-07 06:47:22 +0000 |
| commit | 79334f5fa3db59b56b08f0b27ac0df680981c469 (patch) | |
| tree | fe32b4c246d3aed14a6c93a6727103c30754b4d2 | |
| parent | dd481d0990889bef66e535ffee9404ebad40b1a4 (diff) | |
| download | drakx-79334f5fa3db59b56b08f0b27ac0df680981c469.tar drakx-79334f5fa3db59b56b08f0b27ac0df680981c469.tar.gz drakx-79334f5fa3db59b56b08f0b27ac0df680981c469.tar.bz2 drakx-79334f5fa3db59b56b08f0b27ac0df680981c469.tar.xz drakx-79334f5fa3db59b56b08f0b27ac0df680981c469.zip | |
use the module category to decide if it needs alias usb-interface or alias ieee1394-controller
| -rw-r--r-- | perl-install/modules.pm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 4c4a5fe59..4a1675aef 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -385,8 +385,6 @@ sub when_load { } load('snd-pcm-oss') if $name =~ /^snd-/; - add_alias('ieee1394-controller', $name) if member($name, 'ohci1394'); - add_probeall('usb-interface', $name) if member($name, qw(usb-uhci usb-ohci ehci-hcd uhci-hcd ohci-hcd)); $conf{$name}{options} = join " ", @options if @options; @@ -399,8 +397,11 @@ sub when_load { if ($category =~ m,disk/(scsi|hardware_raid|usb|firewire),) { add_probeall('scsi_hostadapter', $name); eval { load('sd_mod') }; - } - if ($category =~ /sound/) { + } elsif ($category eq 'bus/usb') { + add_probeall('usb-interface', $name); + } elsif ($category eq 'bus/firewire') { + add_alias('ieee1394-controller', $name); + } elsif ($category =~ /sound/) { my $sound_alias = find { /^sound-slot-[0-9]+$/ && $conf{$_}{alias} eq $name } keys %conf; $sound_alias ||= 'sound-slot-0'; add_alias($sound_alias, $name); |