diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-03-15 14:31:14 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-03-15 14:31:14 +0000 |
| commit | c7dad17b3fb33460bdf011f7c785a9ebd2da47dc (patch) | |
| tree | 27bc16991e9001d44b661162d92d26484294ffba /perl-install/detect_devices.pm | |
| parent | 7640d17c1c60117288767369534d875baf432314 (diff) | |
| download | drakx-backup-do-not-use-c7dad17b3fb33460bdf011f7c785a9ebd2da47dc.tar drakx-backup-do-not-use-c7dad17b3fb33460bdf011f7c785a9ebd2da47dc.tar.gz drakx-backup-do-not-use-c7dad17b3fb33460bdf011f7c785a9ebd2da47dc.tar.bz2 drakx-backup-do-not-use-c7dad17b3fb33460bdf011f7c785a9ebd2da47dc.tar.xz drakx-backup-do-not-use-c7dad17b3fb33460bdf011f7c785a9ebd2da47dc.zip | |
- add dmi_probe()
- some special code on dmi is now moved in dmitable with flags Pkg: and Module:
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 1f376aeb1..2d8402eeb 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -729,13 +729,21 @@ sub pcmcia_probe() { @devs; } +my $dmi_probe; +sub dmi_probe() { + $dmi_probe ||= [ map { + /(.*?)\t(.*)/ && { bus => 'DMI', driver => $1, description => $2 }; + } c::dmi_probe() ]; + @$dmi_probe; +} + # pcmcia_probe provides field "device", used in network.pm # => probeall with $probe_type is unsafe sub probeall() { return if $::noauto; require sbus_probing::main; - pci_probe(), usb_probe(), firewire_probe(), pcmcia_probe(), sbus_probing::main::probe(); + pci_probe(), usb_probe(), firewire_probe(), pcmcia_probe(), sbus_probing::main::probe(), dmi_probe(); } sub matching_desc__regexp { my ($regexp) = @_; |