From 52f0e1cfd432bc74b499496ac182fc7e540fc9ce Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 24 Nov 2009 16:44:50 +0000
Subject: (format_bus_ids) do not display bogus "0" ids for hard disks
 (rationale: do not vivify ids)

---
 perl-install/NEWS                  | 1 +
 perl-install/standalone/harddrake2 | 2 ++
 2 files changed, 3 insertions(+)

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});
-- 
cgit v1.2.1