From 44cb3c97ead2986bf66ed956690ef1fee790c634 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Thu, 4 Dec 2008 14:06:42 +0000
Subject: do not list PATA controllers as SATA (alternative would be to just
 list all ATA controllers together)

---
 perl-install/NEWS              | 3 +++
 perl-install/harddrake/data.pm | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 945d1df12..1075ee138 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -4,6 +4,9 @@
   o write distro release in bug description
 - finish-install:
   o show only installed 3D desktops
+- harddrake:
+  o do not list PATA controllers as SATA
+    (else we could just list all ATA controllers together)
 
 Version 11.71 - 6 November 2008
 
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index c46e4cf25..13c0f303f 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -64,7 +64,7 @@ our @tree =
       string => N("SATA controllers"),
       icon => "ide_hd.png",
       configurator => "",
-      detector => sub { f(detect_devices::probe_category('disk/sata')) },
+      detector => sub { f(grep { $_->{driver} !~ /^pata/ } detect_devices::probe_category('disk/sata')) },
       checked_on_boot => 1,
      },
 
@@ -84,7 +84,8 @@ our @tree =
       icon => "ide_hd.png",
       configurator => "",
       detector => sub { f(detect_devices::probe_category('disk/ide')),
-                          f(grep { $_->{media_type} =~ /STORAGE_(IDE|OTHER)/ } @devices) },
+                          f(grep { $_->{driver} =~ /^pata/ && $_->{media_type} =~ /IDE/ } @devices),
+                              f(grep { $_->{media_type} =~ /STORAGE_(IDE|OTHER)/ } @devices) },
       checked_on_boot => 1,
      },
 
-- 
cgit v1.2.1