From 3798dad1ff797cbbb2b9a406c4178b65def425be Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 7 Dec 2004 16:47:05 +0000
Subject: look for yenta_socket in pci_probe too (nb: ldetect pci_probe has a
 special rule for it, not simply pcitable)

---
 perl-install/detect_devices.pm            | 6 ++++++
 perl-install/install_steps_interactive.pm | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 50018f99b..d293ba47a 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -699,6 +699,12 @@ sub firewire_probe() {
     @l;
 }
 
+sub real_pcmcia_probe() {
+    return if $::testing;
+
+    c::pcmcia_probe() || (find { $_->{driver} eq 'yenta_socket' } pci_probe()) && 'yenta_socket';
+}
+
 sub pcmcia_probe() {
     -e '/var/run/stab' || -e '/var/lib/pcmcia/stab' or return ();
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 08683cd0e..efb2954f3 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -225,7 +225,7 @@ sub setupSCSI {
     my ($o) = @_;
 
     if (!$::noauto && arch() =~ /i.86/) {
-	if ($o->{pcmcia} ||= !$::testing && c::pcmcia_probe()) {
+	if ($o->{pcmcia} ||= detect_devices::real_pcmcia_probe()) {
 	    my $w = $o->wait_message(N("PCMCIA"), N("Configuring PCMCIA cards..."));
 	    my $results = install_any::configure_pcmcia($o->{modules_conf}, $o->{pcmcia});
 	    undef $w;
-- 
cgit v1.2.1