From 38ee09c12951a64a51d5175714fcfd3fa11a2d18 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Tue, 15 Mar 2005 17:04:03 +0000
Subject: fix pcmcia modules loading

---
 perl-install/install_any.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install')

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");
-- 
cgit v1.2.1