summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-10-19 17:59:49 +0000
committerFrancois Pons <fpons@mandriva.com>1999-10-19 17:59:49 +0000
commitc0611b612c6d5dcf66e6441dd2824eebdec329e5 (patch)
treea22aa70ac07fe81873e295678f039063d629940d
parenta0ba83ca6ac98200ea2f6418a3240741b165b7cd (diff)
downloaddrakx-backup-do-not-use-c0611b612c6d5dcf66e6441dd2824eebdec329e5.tar
drakx-backup-do-not-use-c0611b612c6d5dcf66e6441dd2824eebdec329e5.tar.gz
drakx-backup-do-not-use-c0611b612c6d5dcf66e6441dd2824eebdec329e5.tar.bz2
drakx-backup-do-not-use-c0611b612c6d5dcf66e6441dd2824eebdec329e5.tar.xz
drakx-backup-do-not-use-c0611b612c6d5dcf66e6441dd2824eebdec329e5.zip
*** empty log message ***
-rw-r--r--perl-install/Xconfigurator_consts.pm2
-rw-r--r--perl-install/install2.pm4
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm
index f7c174f22..09a893717 100644
--- a/perl-install/Xconfigurator_consts.pm
+++ b/perl-install/Xconfigurator_consts.pm
@@ -32,7 +32,7 @@ $resolution_wanted = "1024x768";
);
@svgaservers = grep { $serversdriver{$_} eq "svga" } keys(%serversdriver);#-qw(SVGA Rage128);
@accelservers = grep { $serversdriver{$_} eq "accel" } keys(%serversdriver);#-qw(S3 Mach32 Mach8 8514 P9000 AGX W32 Mach64 I128 S3V 3DLabs);
-@allservers = keys(%serversdrivers);#-(qw(Mono VGA16), @svgaservers, @accelservers);
+@allservers = keys(%serversdriver);#-(qw(Mono VGA16), @svgaservers, @accelservers);
{ #- @monitorSize2resolution
my %l = my @l = ( #- size in inch
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index fc06ec063..6468d00cb 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -440,6 +440,10 @@ sub main {
}
unlink "/sbin/insmod" unless $::testing;
+ unlink "/modules/pcmcia_core.o" unless $::testing; #- always use module from archive.
+ unlink "/modules/i82365.o" unless $::testing;
+ unlink "/modules/tcic.o" unless $::testing;
+ unlink "/modules/ds.o" unless $::testing;
print STDERR "in second stage install\n";
log::openLog(($::testing || $o->{localInstall}) && 'debug.log');