From 13de91fbb60952073cf1d070fb1692d968d8d9b1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 7 Jul 2004 02:12:31 +0000
Subject: - move configure_pcmcia() and write_pcmcia() out of modules.pm to
 install_any.pm - load pcmcia_core, $pcic and ds in one call to modules::load
 - don't pass prefix to write_pcmcia()

---
 perl-install/modules.pm | 41 -----------------------------------------
 1 file changed, 41 deletions(-)

(limited to 'perl-install/modules.pm')

diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 7bc173d4f..a3d7b9b30 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -354,47 +354,6 @@ sub read_stage1_conf {
     mergein_conf($_[0]);
 }
 
-#-###############################################################################
-#- pcmcia various
-#-###############################################################################
-sub configure_pcmcia {
-    my ($pcic) = @_;
-
-    #- try to setup pcmcia if cardmgr is not running.
-    my $running if 0;
-    return if $running;
-    $running = 1;
-
-    log::l("i try to configure pcmcia services");
-
-    symlink "/tmp/stage2/$_", $_ foreach "/etc/pcmcia";
-
-    eval {
-	load("pcmcia_core");
-	load($pcic);
-	load("ds");
-    };
-
-    #- run cardmgr in foreground while it is configuring the card.
-    run_program::run("cardmgr", "-f", "-m", "/modules");
-    sleep(3);
-    
-    #- make sure to be aware of loaded module by cardmgr.
-    read_already_loaded();
-}
-
-sub write_pcmcia {
-    my ($prefix, $pcmcia) = @_;
-
-    #- should be set after installing the package above otherwise the file will be renamed.
-    setVarsInSh("$prefix/etc/sysconfig/pcmcia", {
-	PCMCIA    => bool2yesno($pcmcia),
-	PCIC      => $pcmcia,
-	PCIC_OPTS => "",
-        CORE_OPTS => "",
-    });
-}
-
 
 #-###############################################################################
 #- internal functions
-- 
cgit v1.2.1