summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-11-24 16:44:50 +0000
committerThierry Vignaud <tv@mandriva.org>2009-11-24 16:44:50 +0000
commit52f0e1cfd432bc74b499496ac182fc7e540fc9ce (patch)
tree88affdc7a6e79b4f2ff6e5622718e9390a6828f9
parentc1755fab0a585fd0fd7f84c38d8ccd395fdfcbba (diff)
downloaddrakx-52f0e1cfd432bc74b499496ac182fc7e540fc9ce.tar
drakx-52f0e1cfd432bc74b499496ac182fc7e540fc9ce.tar.gz
drakx-52f0e1cfd432bc74b499496ac182fc7e540fc9ce.tar.bz2
drakx-52f0e1cfd432bc74b499496ac182fc7e540fc9ce.tar.xz
drakx-52f0e1cfd432bc74b499496ac182fc7e540fc9ce.zip
(format_bus_ids) do not display bogus "0" ids for hard disks
(rationale: do not vivify ids)
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/harddrake22
2 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index a18b20792..bf8fd80cc 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -6,6 +6,7 @@
o do not suggest Windows mountpoint for mounted partitions
(breaks install if the Win partition is the installer media)
- harddrake:
+ o do not display bogus "0" ids for hard disks
o fix detecting some mice
Version 12.78 - 18 November 2009
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 02b0d08ce..97beec64b 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -491,6 +491,8 @@ undef $flush_guard;
sub format_bus_ids {
my ($device) = $_;
+ # do not vivify ids:
+ return if !($device->{vendor} && $device->{id});
foreach my $field (qw(vendor id subvendor subid)) {
next if !$device->{$field};
$device->{$field} = sprintf("0x%04x", $device->{$field});