summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-07 02:12:31 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-07 02:12:31 +0000
commit13de91fbb60952073cf1d070fb1692d968d8d9b1 (patch)
tree2b191e05c09e92d381c6750c045ce664906636bd /perl-install/install_steps.pm
parentdbba4bdb651ed70c3b76b570f49516a9426dd0cf (diff)
downloaddrakx-13de91fbb60952073cf1d070fb1692d968d8d9b1.tar
drakx-13de91fbb60952073cf1d070fb1692d968d8d9b1.tar.gz
drakx-13de91fbb60952073cf1d070fb1692d968d8d9b1.tar.bz2
drakx-13de91fbb60952073cf1d070fb1692d968d8d9b1.tar.xz
drakx-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/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index ec83e3fd9..1660b2a89 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -153,7 +153,7 @@ sub acceptLicense {}
#------------------------------------------------------------------------------
sub setupSCSI {
my ($o) = @_;
- modules::configure_pcmcia($o->{pcmcia}) if $o->{pcmcia};
+ install_any::configure_pcmcia($o->{pcmcia}) if $o->{pcmcia};
modules::load(modules::category2modules('disk/cdrom'));
modules::load_category('bus/firewire');
modules::load_category('disk/scsi|hardware_raid|firewire');
@@ -433,7 +433,7 @@ Consoles 1,3,4,7 may also contain interesting information";
run_program::rooted($o->{prefix}, 'lvm2', 'vgscan') if -e '/etc/lvmtab';
#- configure PCMCIA services if needed.
- modules::write_pcmcia($o->{prefix}, $o->{pcmcia});
+ install_any::write_pcmcia($o->{pcmcia});
#- for mandrake_firstime
touch "$o->{prefix}/var/lock/TMP_1ST";