summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/harddrake/autoconf.pm12
-rw-r--r--perl-install/install_any.pm12
-rw-r--r--perl-install/install_steps.pm3
-rwxr-xr-xperl-install/standalone/service_harddrake4
4 files changed, 17 insertions, 14 deletions
diff --git a/perl-install/harddrake/autoconf.pm b/perl-install/harddrake/autoconf.pm
index adf6d9957..061d738af 100644
--- a/perl-install/harddrake/autoconf.pm
+++ b/perl-install/harddrake/autoconf.pm
@@ -31,4 +31,16 @@ sub mouse_conf {
mouse::write_conf(do_pkgs_standalone->new, $modules_conf, mouse::detect($modules_conf), 1);
}
+sub pcmcia {
+ my ($pcic) = @_;
+
+ #- should be set after installing the package above otherwise the file will be renamed.
+ setVarsInSh("$::prefix/etc/sysconfig/pcmcia", {
+ PCMCIA => bool2yesno($pcic),
+ PCIC => $pcic,
+ PCIC_OPTS => "",
+ CORE_OPTS => "",
+ });
+}
+
1;
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index ea9e8fe9d..194e942bd 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1551,17 +1551,5 @@ sub configure_pcmcia {
modules::read_already_loaded($modules_conf);
}
-sub write_pcmcia {
- my ($pcic) = @_;
-
- #- should be set after installing the package above otherwise the file will be renamed.
- setVarsInSh("$::prefix/etc/sysconfig/pcmcia", {
- PCMCIA => bool2yesno($pcic),
- PCIC => $pcic,
- PCIC_OPTS => "",
- CORE_OPTS => "",
- });
-}
-
1;
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 53aa21a2b..77cbda0ed 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -503,7 +503,8 @@ 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.
- install_any::write_pcmcia($o->{pcmcia});
+ require harddrake::autoconf;
+ harddrake::autoconf::pcmcia($o->{pcmcia});
#- for mandrake_firstime
touch "$o->{prefix}/var/lock/TMP_1ST";
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 070b6dc29..f897ec230 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -139,10 +139,12 @@ foreach my $hw_class (@harddrake::data::tree) {
network::ethernet::configure_eth_aliases($modules_conf);
$modules_conf->write;
next;
- } elsif (member($Ident, qw(AGP ATA_STORAGE PCMCIA_CONTROLLER SATA_STORAGE SCSI_CONTROLLER TV))) {
+ } elsif (member($Ident, qw(AGP ATA_STORAGE SATA_STORAGE SCSI_CONTROLLER TV))) {
# add agpgart and the like modules to modprobe.preload if needed:
$modules_conf->write;
next;
+ } elsif ($Ident eq "PCMCIA_CONTROLLER") {
+ harddrake::autoconf::pcmcia($added[0]->{driver});
} elsif ($Ident eq "USB_CONTROLLER") {
modules::load_category($modules_conf, 'bus/usb');
$modules_conf->write;