diff options
| author | Francois Pons <fpons@mandriva.com> | 1999-09-19 17:04:12 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 1999-09-19 17:04:12 +0000 |
| commit | a0b5f74447cc699c43c354cb6397ed554605729b (patch) | |
| tree | 28a57861ab59ec044333b4e52d0ea9fbb1c6ce08 | |
| parent | 1017610aa70508afa1fe9f41dd0987522652f135 (diff) | |
| download | drakx-backup-do-not-use-a0b5f74447cc699c43c354cb6397ed554605729b.tar drakx-backup-do-not-use-a0b5f74447cc699c43c354cb6397ed554605729b.tar.gz drakx-backup-do-not-use-a0b5f74447cc699c43c354cb6397ed554605729b.tar.bz2 drakx-backup-do-not-use-a0b5f74447cc699c43c354cb6397ed554605729b.tar.xz drakx-backup-do-not-use-a0b5f74447cc699c43c354cb6397ed554605729b.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 1 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 17 |
3 files changed, 19 insertions, 1 deletions
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(); } #------------------------------------------------------------------------------ @@ -177,6 +177,21 @@ sub configureNetwork($) { } #------------------------------------------------------------------------------ +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) = @_; my $t = $o->{timezone}; |