diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-07 02:12:31 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-07 02:12:31 +0000 |
commit | 13de91fbb60952073cf1d070fb1692d968d8d9b1 (patch) | |
tree | 2b191e05c09e92d381c6750c045ce664906636bd /perl-install/modules.pm | |
parent | dbba4bdb651ed70c3b76b570f49516a9426dd0cf (diff) | |
download | drakx-backup-do-not-use-13de91fbb60952073cf1d070fb1692d968d8d9b1.tar drakx-backup-do-not-use-13de91fbb60952073cf1d070fb1692d968d8d9b1.tar.gz drakx-backup-do-not-use-13de91fbb60952073cf1d070fb1692d968d8d9b1.tar.bz2 drakx-backup-do-not-use-13de91fbb60952073cf1d070fb1692d968d8d9b1.tar.xz drakx-backup-do-not-use-13de91fbb60952073cf1d070fb1692d968d8d9b1.zip |
- 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()
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r-- | perl-install/modules.pm | 41 |
1 files changed, 0 insertions, 41 deletions
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 |