From 002bf362f20c1e0dab31f72fb510a4199d28ac53 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 6 Jan 2009 15:51:52 +0000
Subject: do not list PATA controllers as SATA (alternative would be to just
 list all ATA controllers together) [backported from trunk]

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

diff --git a/perl-install/NEWS b/perl-install/NEWS
index c10bc1503..94333183f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,9 @@
   o fix crashing on writing fstab when using SMB (#46084)
   o fix racing with udev (#41832)
   o --nfs: handle "host:/" (#44320)
+- harddrake:
+  o do not list PATA controllers as SATA
+    (else we could just list all ATA controllers together)
 
 Version 11.71.2 - 5 December 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