summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-02-07 13:46:05 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-02-07 13:46:05 +0000
commit9c6baa48e2fb448898c6d7ef3502099145c7ade7 (patch)
tree40b8aba5f3940a68bd9ca4030a8d6416c0ad6e90
parentbf94534373388ca9045276bbea9ee861f06926f6 (diff)
downloaddrakx-9c6baa48e2fb448898c6d7ef3502099145c7ade7.tar
drakx-9c6baa48e2fb448898c6d7ef3502099145c7ade7.tar.gz
drakx-9c6baa48e2fb448898c6d7ef3502099145c7ade7.tar.bz2
drakx-9c6baa48e2fb448898c6d7ef3502099145c7ade7.tar.xz
drakx-9c6baa48e2fb448898c6d7ef3502099145c7ade7.zip
(miscellaneous): remove asking about numlock and hd optimizations,
deprecates it (aka don't do anything)
-rw-r--r--perl-install/install_steps_interactive.pm28
1 files changed, 8 insertions, 20 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 9d46e2658..eee8da4b2 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -602,7 +602,7 @@ sub afterInstallPackages($) {
sub configureNetwork {
my ($o, $first_time) = @_;
require netconnect;
- netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o->{netc}, $o->{mouse}, $o, $o->{pcmcia}, $o->{intf},
+ netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o->{netc}, $o->{mouse}, $o, $o->{intf},
sub { $o->pkg_install(@_) }, $first_time, $o->{lang} eq "fr_FR" && $o->{keyboard} eq "fr");
}
@@ -882,10 +882,10 @@ try to force installation even if that destroys the first partition?"));
}
}
-#------------------------------------------------------------------------------
-#- miscellaneousNetwork moved to network.pm
-#------------------------------------------------------------------------------
+#- deprecated
sub miscellaneous {
+ return;
+
my ($o, $clicked) = @_;
my %l = (
0 => _("Welcome To Crackers"),
@@ -898,7 +898,6 @@ sub miscellaneous {
delete @l{0,1,5} unless $::expert;
my $u = $o->{miscellaneous} ||= {};
- exists $u->{LAPTOP} or $u->{LAPTOP} = 1;
my $s = $o->{security};
install_interactive::tellAboutProprietaryModules($o) unless $clicked;
@@ -908,20 +907,8 @@ sub miscellaneous {
$::expert || $clicked and $o->ask_from_entries_refH('',
_("Miscellaneous questions"), [
-{ label => _("Use hard drive optimisations?"), val => \$u->{HDPARM}, type => 'bool', text => _("(may cause data corruption)") },
{ label => _("Choose security level"), val => \$s, list => [ map { $l{$_} } ikeys %l ] },
-{ label => _("Precise RAM size if needed (found %d MB)", availableRamMB()), val => \$u->{memsize} },
- if_(arch() !~ /^sparc/,
-{ label => _("Removable media automounting"), val => \$o->{useSupermount}, type => 'bool', text => 'supermount' },
- ), if_($::expert,
-{ label => _("Clean /tmp at each boot"), val => \$u->{CLEAN_TMP}, type => 'bool' },
- ), $o->{pcmcia} && $::expert ? (
-{ label => _("Enable multi profiles"), val => \$u->{profiles}, type => 'bool' },
- ) : (
-{ label => _("Enable num lock at startup"), val => \$u->{numlock}, type => 'bool' },
- ),
], complete => sub {
- !$u->{memsize} || $u->{memsize} =~ /K$/ || $u->{memsize} =~ s/^(\d+)M?$/$1M/i or $o->ask_warn('', _("Give the ram size in MB")), return 1;
my %m = reverse %l; $ENV{SECURE_LEVEL} = $o->{security} = $m{$s};
$o->{useSupermount} && $o->{security} > 3 and $o->ask_warn('', _("Can't use supermount in high security level")), return 1;
$o->{security} == 5 and $o->ask_okcancel('',
@@ -929,9 +916,10 @@ _("beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!
If you want to be root, you have to login as a user and then use \"su\".
More generally, do not expect to use your machine for anything but as a server.
You have been warned.")) || return;
- $u->{numlock} && $o->{pcmcia} and $o->ask_okcancel('',
+
+ #- message below kept in case it is of any use again. (otherwise removed from po and pablo is not happy ;p)
_("Be carefull, having numlock enabled causes a lot of keystrokes to
-give digits instead of normal letters (eg: pressing `p' gives `6')")) || return;
+give digits instead of normal letters (eg: pressing `p' gives `6')");
0; }
) || return;
@@ -953,7 +941,7 @@ sub configureX {
{ local $::testing = 0; #- unset testing
local $::auto = !$::expert && !$clicked;
- Xconfigurator::main($o->{prefix}, $o->{X}, $o, $o->{allowFB}, bool($o->{pcmcia}), sub {
+ Xconfigurator::main($o->{prefix}, $o->{X}, $o, $o->{allowFB}, sub {
$o->pkg_install(@_);
});
}