summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-12 16:39:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-12 16:39:14 +0000
commitdff746444b3fc778dbf9f818cc3247161548cebe (patch)
tree557dc643599c3d6a71beecbe82384fd880f4094a /perl-install/install_steps.pm
parent8adabacd95f6a4455027f00084e39958fada6083 (diff)
downloaddrakx-backup-do-not-use-dff746444b3fc778dbf9f818cc3247161548cebe.tar
drakx-backup-do-not-use-dff746444b3fc778dbf9f818cc3247161548cebe.tar.gz
drakx-backup-do-not-use-dff746444b3fc778dbf9f818cc3247161548cebe.tar.bz2
drakx-backup-do-not-use-dff746444b3fc778dbf9f818cc3247161548cebe.tar.xz
drakx-backup-do-not-use-dff746444b3fc778dbf9f818cc3247161548cebe.zip
no_comment
Diffstat (limited to 'perl-install/install_steps.pm')
-rw-r--r--perl-install/install_steps.pm20
1 files changed, 4 insertions, 16 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 3d7e35426..573619048 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -117,7 +117,9 @@ sub selectInstallClass($@) {
}}{$o->{installClass}};
}
#------------------------------------------------------------------------------
-sub setupSCSI {
+sub setupSCSI {
+ my ($o) = @_;
+ modules::configure_pcmcia($o->{pcmcia});
modules::load_ide();
modules::load_thiskind('scsi|disk');
}
@@ -383,7 +385,7 @@ Consoles 1,3,4,7 may also contain interesting information";
sync(); sync();
#- configure PCMCIA services if needed.
- $o->pcmciaConfig();
+ modules::write_pcmcia($o->{prefix}, $o->{pcmcia});
#- for mandrake_firstime
touch "$o->{prefix}/var/lock/TMP_1ST";
@@ -515,20 +517,6 @@ sub installCrypto {
}
#------------------------------------------------------------------------------
-sub pcmciaConfig($) {
- my ($o) = @_;
- my $t = $o->{pcmcia};
-
- #- should be set after installing the package above else the file will be renamed.
- setVarsInSh("$o->{prefix}/etc/sysconfig/pcmcia", {
- PCMCIA => $t ? "yes" : "no",
- PCIC => $t,
- PCIC_OPTS => "",
- CORE_OPTS => "",
- });
-}
-
-#------------------------------------------------------------------------------
sub configureTimezone {
my ($o, $f) = @_;
require timezone;