From a0b5f74447cc699c43c354cb6397ed554605729b Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Sun, 19 Sep 1999 17:04:12 +0000
Subject: *** empty log message ***

---
 perl-install/install2.pm      |  2 ++
 perl-install/install_any.pm   |  1 +
 perl-install/install_steps.pm | 17 ++++++++++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index fb6e66aae..80ec99f6b 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -377,6 +377,8 @@ sub main {
 	} elsif (/--g_auto_install/) {
 	    $::testing = $::g_auto_install = 1;
 	    $o->{partitioning}{auto_allocate} = 1;
+	} elsif (/--pcmcia/) {
+	    $o->{pcmcia} = shift;
 	}       
     }
 
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index db06b9d89..e8008bd82 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -122,6 +122,7 @@ sub setPackages($$) {
 	$o->{compssListLevels} = pkgs::readCompssList($o->{packages});
 	$o->{compssListLevels} ||= $install_classes;
 	push @{$o->{base}}, "kernel-smp" if detect_devices::hasSMP();
+	push @{$o->{base}}, "kernel-pcmcia-cs" if $o->{pcmcia};
     }
     
     do {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index cf13372b9..181c37099 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -154,7 +154,7 @@ sub afterInstallPackages($) {
     #-  why not? cuz weather is nice today :-) [pixel]
     sync(); sync();
 
-#    configPCMCIA($o->{rootPath}, $o->{pcmcia});
+    $o->pcmciaConfig();
 }
 
 #------------------------------------------------------------------------------
@@ -176,6 +176,21 @@ sub configureNetwork($) {
     #-res_init();		#- reinit the resolver so DNS changes take affect     
 }
 
+#------------------------------------------------------------------------------
+sub pcmciaConfig($) {
+    my ($o) = @_;
+    my $t = $o->{pcmcia};
+    my $f = "$o->{prefix}/etc/sysconfig/pcmcia";
+
+    # should be set after installing the package above else the file will be renamed.
+    setVarsInSh($f, {
+	PCMCIA    => $t ? "yes" : "no",
+	PCIC      => $t,
+	PCIC_OPTS => "",
+        CORE_OPTS => "",
+    });
+}
+
 #------------------------------------------------------------------------------
 sub timeConfig {
     my ($o, $f) = @_;
-- 
cgit v1.2.1