diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-03-20 14:09:41 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-03-20 14:09:41 +0000 |
| commit | ae03c25f61467f2eaedc62a23a925237ff8a7e29 (patch) | |
| tree | 781f562d2752c41b3de8fe16560de99375c1f721 /perl-install/install2.pm | |
| parent | 6204c74c31825e9f732dad63e75bc9555b2fae6b (diff) | |
| download | drakx-ae03c25f61467f2eaedc62a23a925237ff8a7e29.tar drakx-ae03c25f61467f2eaedc62a23a925237ff8a7e29.tar.gz drakx-ae03c25f61467f2eaedc62a23a925237ff8a7e29.tar.bz2 drakx-ae03c25f61467f2eaedc62a23a925237ff8a7e29.tar.xz drakx-ae03c25f61467f2eaedc62a23a925237ff8a7e29.zip | |
- tellAboutProprietaryModules moved to setupSCSI
- miscellaneous step re-enabled, called Security
- pcmcia_probe moved to setupSCSI, skipped in noauto
Diffstat (limited to 'perl-install/install2.pm')
| -rw-r--r-- | perl-install/install2.pm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 6b3e17c8e..1ac378c4d 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -41,7 +41,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, 1 ], + miscellaneous => [ __("Security"), 1, 1, '!$::expert' ], doPartitionDisks => [ __("Setup filesystems"), 1, 0, '', "selectInstallClass" ], formatPartitions => [ __("Format partitions"), 1, -1, '', "doPartitionDisks" ], choosePackages => [ __("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions" ], @@ -154,7 +154,7 @@ sub selectMouse { #------------------------------------------------------------------------------ sub setupSCSI { my ($clicked) = @_; - $o->setupSCSI(!$::expert && !$clicked, $clicked); + $o->setupSCSI($clicked); } #------------------------------------------------------------------------------ @@ -473,8 +473,6 @@ sub main { eval { $o = $::o = install_any::loadO($o, "patch") } if $patch; eval { $o = $::o = install_any::loadO($o, $cfg) } if $cfg; - $o->{pcmcia} ||= c::pcmcia_probe(); - eval { modules::load("af_packet") }; map_index { |