summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-12-13 15:43:14 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-12-13 15:43:14 +0000
commiteaff4e56b26ec68a6a4677543d40555f776db028 (patch)
treeea66e65f624cf937899c6aa2d1f03c2d15cb99c8
parent2ecdde6b60c0214d641f41f251b9098068ec7430 (diff)
downloaddrakx-eaff4e56b26ec68a6a4677543d40555f776db028.tar
drakx-eaff4e56b26ec68a6a4677543d40555f776db028.tar.gz
drakx-eaff4e56b26ec68a6a4677543d40555f776db028.tar.bz2
drakx-eaff4e56b26ec68a6a4677543d40555f776db028.tar.xz
drakx-eaff4e56b26ec68a6a4677543d40555f776db028.zip
(pcmcia_controller_probe) move some harddrake code there
-rw-r--r--perl-install/detect_devices.pm6
-rw-r--r--perl-install/harddrake/data.pm6
2 files changed, 7 insertions, 5 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index d293ba47a..c0a07f0c3 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -699,6 +699,12 @@ sub firewire_probe() {
@l;
}
+sub pcmcia_controller_probe() {
+ require list_modules;
+ my @modules = list_modules::category2modules('bus/pcmcia');
+ grep { member($_->{driver}, @modules) } probeall();
+}
+
sub real_pcmcia_probe() {
return if $::testing;
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index d45486270..a17b77535 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -317,11 +317,7 @@ our @tree =
string => N("PCMCIA controllers"),
icon => "scsi.png",
configurator => "",
- detector => sub {
- require list_modules;
- my @modules = list_modules::category2modules('bus/pcmcia');
- f(grep { member($_->{driver}, @modules) } @devices);
- },
+ detector => sub { f(detect_devices::pcmcia_controller_probe()) },
checked_on_boot => 1,
},