From dff746444b3fc778dbf9f818cc3247161548cebe Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 12 Sep 2000 16:39:14 +0000
Subject: no_comment

---
 perl-install/install_steps.pm | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

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

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";
@@ -514,20 +516,6 @@ sub installCrypto {
     $o->pkg_install(@{$u->{packages}});
 }
 
-#------------------------------------------------------------------------------
-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) = @_;
-- 
cgit v1.2.1