diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-12-07 16:47:05 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-12-07 16:47:05 +0000 |
| commit | 3798dad1ff797cbbb2b9a406c4178b65def425be (patch) | |
| tree | cba27911e79b98006f5c27bfbe1f00f6c50f37c4 | |
| parent | bd14e3d7589f4221780a38e4f2f0b04976671424 (diff) | |
| download | drakx-3798dad1ff797cbbb2b9a406c4178b65def425be.tar drakx-3798dad1ff797cbbb2b9a406c4178b65def425be.tar.gz drakx-3798dad1ff797cbbb2b9a406c4178b65def425be.tar.bz2 drakx-3798dad1ff797cbbb2b9a406c4178b65def425be.tar.xz drakx-3798dad1ff797cbbb2b9a406c4178b65def425be.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.pm | 6 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 |
2 files changed, 7 insertions, 1 deletions
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; |