summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-12-07 16:47:40 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-12-07 16:47:40 +0000
commitaef3c96fc93098789b74ed1b76e6e1f1222c58fd (patch)
tree8ba2c60d7dc86b615b5ea62f0280d93ddd117487
parent8370e919bc681f8708cf336e27a9b4125a4cd581 (diff)
downloaddrakx-aef3c96fc93098789b74ed1b76e6e1f1222c58fd.tar
drakx-aef3c96fc93098789b74ed1b76e6e1f1222c58fd.tar.gz
drakx-aef3c96fc93098789b74ed1b76e6e1f1222c58fd.tar.bz2
drakx-aef3c96fc93098789b74ed1b76e6e1f1222c58fd.tar.xz
drakx-aef3c96fc93098789b74ed1b76e6e1f1222c58fd.zip
look for yenta_socket in pci_probe too (nb: ldetect pci_probe has a special rule for it, not simply pcitable)
-rw-r--r--perl-install/detect_devices.pm6
-rw-r--r--perl-install/install_steps_interactive.pm2
2 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index e78de8480..2361f3f9d 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -692,6 +692,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 40ba786c6..73ba37208 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -227,7 +227,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;