summaryrefslogtreecommitdiffstats
path: root/perl-install/modules.pm
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-11-21 14:54:53 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-11-21 14:54:53 +0000
commit34be445681c8dc42b73e95b80464ebad33503e8e (patch)
treea0b7a8d1f57a339195ca6e2cc17d0dde80e63f07 /perl-install/modules.pm
parent06e0bdfe68920691681c0db04f31dc1c90fdad98 (diff)
downloaddrakx-34be445681c8dc42b73e95b80464ebad33503e8e.tar
drakx-34be445681c8dc42b73e95b80464ebad33503e8e.tar.gz
drakx-34be445681c8dc42b73e95b80464ebad33503e8e.tar.bz2
drakx-34be445681c8dc42b73e95b80464ebad33503e8e.tar.xz
drakx-34be445681c8dc42b73e95b80464ebad33503e8e.zip
migrate pcmcia in drakx to use in-kernel version (only
for 2.4, though --> pcmcia in 2.2 no longer supported)
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r--perl-install/modules.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index cec1fa16f..c48cf87ba 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -807,6 +807,12 @@ sub configure_pcmcia {
return if $running;
$running = 1;
+ if (c::kernel_version() =~ /^2\.2/) {
+ my $msg = _("PCMCIA support no longer exist for 2.2 kernels. Please use a 2.4 kernel.");
+ log::l($msg);
+ return $msg;
+ }
+
log::l("i try to configure pcmcia services");
symlink "/tmp/stage2/$_", $_ foreach "/etc/pcmcia";
@@ -818,7 +824,7 @@ sub configure_pcmcia {
};
#- run cardmgr in foreground while it is configuring the card.
- run_program::run("cardmgr-" . c::kernel_version(), "-f", "-m" ,"/modules");
+ run_program::run("cardmgr", "-f", "-m" ,"/modules");
sleep(3);
#- make sure to be aware of loaded module by cardmgr.