diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-03-06 15:30:26 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-03-06 15:30:26 +0000 |
| commit | 842368b5db0a465298bf169a7434401e381bc956 (patch) | |
| tree | 67a95056b3ee6e3b078645e8c11637651a4876d8 | |
| parent | 1b5fd5c2c0b92cc516b16ddaf3d892c475b74db3 (diff) | |
| download | drakx-backup-do-not-use-842368b5db0a465298bf169a7434401e381bc956.tar drakx-backup-do-not-use-842368b5db0a465298bf169a7434401e381bc956.tar.gz drakx-backup-do-not-use-842368b5db0a465298bf169a7434401e381bc956.tar.bz2 drakx-backup-do-not-use-842368b5db0a465298bf169a7434401e381bc956.tar.xz drakx-backup-do-not-use-842368b5db0a465298bf169a7434401e381bc956.zip | |
(stringlist): if no text description, display ids
| -rw-r--r-- | perl-install/detect_devices.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 70977c227..347ad4c7a 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -197,7 +197,8 @@ sub matching_desc { grep { $_->{description} =~ /$regexp/i } probeall(); } sub stringlist { - map { " $_->{description} ($_->{type} $_->{driver})" . ($_->{subid} ? sprintf(" SubVendor=0x%04x SubDevice=0x%04x", $_->{subvendor}, $_->{subid}) : '') } probeall(1); + map { ($_->{description} eq '(null)' ? sprintf("Vendor=0x%04x Device=0x%04x", $_->{vendor}, $_->{id}) : $_->{description}) . + " ($_->{type} $_->{driver})" . ($_->{subid} ? sprintf(" SubVendor=0x%04x SubDevice=0x%04x", $_->{subvendor}, $_->{subid}) : '') } probeall(1); } sub check { my ($l) = @_; |