summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-02-07 13:46:22 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-02-07 13:46:22 +0000
commite7d616a49ca57fe20fadcd41ac3c15bc7ecec210 (patch)
treec36aebccab69faa68ea8988b33239efc5c168fb2
parent0797bea2feb6642fc44a49fee581bcdb39a4375d (diff)
downloaddrakx-e7d616a49ca57fe20fadcd41ac3c15bc7ecec210.tar
drakx-e7d616a49ca57fe20fadcd41ac3c15bc7ecec210.tar.gz
drakx-e7d616a49ca57fe20fadcd41ac3c15bc7ecec210.tar.bz2
drakx-e7d616a49ca57fe20fadcd41ac3c15bc7ecec210.tar.xz
drakx-e7d616a49ca57fe20fadcd41ac3c15bc7ecec210.zip
(@installSteps): remove miscellaneous
(main): don't remove pcmcia modules anymore (not there anymore), remove /sbin/stage1
-rw-r--r--perl-install/install2.pm12
1 files changed, 2 insertions, 10 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 5468206ea..daac16f18 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -43,7 +43,7 @@ my (%installSteps, @orderedInstallSteps);
setupSCSI => [ __("Hard drive detection"), 1, 0, '' ],
selectMouse => [ __("Configure mouse"), 1, 1, '', "selectInstallClass" ],
selectKeyboard => [ __("Choose your keyboard"), 1, 1, '', "selectInstallClass" ],
- miscellaneous => [ __("Miscellaneous"), 1, 1, '!$::expert' ],
+#- miscellaneous => [ __("Miscellaneous"), 1, 1, '!$::expert' ],
doPartitionDisks => [ __("Setup filesystems"), 1, 0, '', "selectInstallClass" ],
formatPartitions => [ __("Format partitions"), 1, -1, '', "doPartitionDisks" ],
choosePackages => [ __("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions" ],
@@ -524,15 +524,7 @@ sub main {
}
unless ($::testing || $::live) {
symlink "image", "/tmp/rhimage"; #- for compatibility with new mdk-stage1
-
- unlink $_ foreach ( $o->{pcmcia} ? () : ("/sbin/install"), #- #- install include cardmgr!
- "/modules/modules.cgz",
- "/sbin/insmod", "/sbin/rmmod",
- "/modules/pcmcia_core.o", #- always use module from archive.
- "/modules/i82365.o",
- "/modules/tcic.o",
- "/modules/ds.o",
- );
+ unlink $_ foreach "/modules/modules.mar", "/sbin/stage1";
}
print STDERR "in second stage install\n";