diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-12-07 16:48:33 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-12-07 16:48:33 +0000 |
| commit | 657432f774f286d27dafbb6d2b1760568244d7a8 (patch) | |
| tree | 38f13ee89d2bd326edff0d8a976a9e10a240f660 | |
| parent | 580d218e09cfc715798376dc0842c4becc087f68 (diff) | |
| download | drakx-backup-do-not-use-657432f774f286d27dafbb6d2b1760568244d7a8.tar drakx-backup-do-not-use-657432f774f286d27dafbb6d2b1760568244d7a8.tar.gz drakx-backup-do-not-use-657432f774f286d27dafbb6d2b1760568244d7a8.tar.bz2 drakx-backup-do-not-use-657432f774f286d27dafbb6d2b1760568244d7a8.tar.xz drakx-backup-do-not-use-657432f774f286d27dafbb6d2b1760568244d7a8.zip | |
look for yenta_socket in pci_probe too
| -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 30468a820..835785f06 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -625,6 +625,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 21257ac19..76d1b2baa 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -221,7 +221,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 = modules::configure_pcmcia($o->{pcmcia}); undef $w; |