summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-03-15 17:04:03 +0000
committerOlivier Blin <oblin@mandriva.org>2005-03-15 17:04:03 +0000
commit38ee09c12951a64a51d5175714fcfd3fa11a2d18 (patch)
tree91d852951de9687456c18e8e309388bbc9291f16
parentcf5f4d02bc5380afa126c75c724517aff6356ea7 (diff)
downloaddrakx-backup-do-not-use-38ee09c12951a64a51d5175714fcfd3fa11a2d18.tar
drakx-backup-do-not-use-38ee09c12951a64a51d5175714fcfd3fa11a2d18.tar.gz
drakx-backup-do-not-use-38ee09c12951a64a51d5175714fcfd3fa11a2d18.tar.bz2
drakx-backup-do-not-use-38ee09c12951a64a51d5175714fcfd3fa11a2d18.tar.xz
drakx-backup-do-not-use-38ee09c12951a64a51d5175714fcfd3fa11a2d18.zip
fix pcmcia modules loading
-rw-r--r--mdk-stage1/stage1.c3
-rw-r--r--perl-install/install_any.pm4
2 files changed, 6 insertions, 1 deletions
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index d6364c6a0..b0c6979c5 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -231,7 +231,10 @@ static void handle_pcmcia(void)
}
my_insmod("pcmcia_core", ANY_DRIVER_TYPE, NULL, 0);
my_insmod(pcmcia_adapter, ANY_DRIVER_TYPE, NULL, 0);
+ /* ds is an alias for pcmcia in recent 2.6 kernels
+ but we don't have modules.alias in install, so try to load both */
my_insmod("ds", ANY_DRIVER_TYPE, NULL, 0);
+ my_insmod("pcmcia", ANY_DRIVER_TYPE, NULL, 0);
/* call to cardmgr takes time, let's use the wait message */
wait_message("Enabling PCMCIA extension cards...");
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 6facb451b..b045cda5c 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1792,7 +1792,9 @@ sub configure_pcmcia {
symlink "/tmp/stage2/$_", $_ foreach "/etc/pcmcia";
- eval { modules::load('pcmcia_core', $pcic, 'ds') };
+ #- ds is an alias for pcmcia in recent 2.6 kernels
+ #- but we don't have modules.alias in install, so try to load both
+ eval { modules::load('pcmcia', $pcic, 'ds', 'pcmcia') };
#- run cardmgr in foreground while it is configuring the card.
run_program::run("cardmgr", "-f", "-m", "/modules");