summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-01-09 12:43:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-01-09 12:43:49 +0000
commit386a093b4929b6da4f15370b28e844618622384f (patch)
tree1c3b89656b06dc20a60d6e539be7943427f36ddc
parent775e9840115458aa09bc5c10a73123bc3c7f9c4c (diff)
downloaddrakx-backup-do-not-use-386a093b4929b6da4f15370b28e844618622384f.tar
drakx-backup-do-not-use-386a093b4929b6da4f15370b28e844618622384f.tar.gz
drakx-backup-do-not-use-386a093b4929b6da4f15370b28e844618622384f.tar.bz2
drakx-backup-do-not-use-386a093b4929b6da4f15370b28e844618622384f.tar.xz
drakx-backup-do-not-use-386a093b4929b6da4f15370b28e844618622384f.zip
(miscellaneous): accept xxxK memsize
-rw-r--r--perl-install/install_steps_interactive.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 73f738f69..58de5c5d1 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -971,7 +971,7 @@ sub miscellaneous {
{ label => _("Enable num lock at startup"), val => \$u->{numlock}, type => 'bool' },
),
], complete => sub {
- !$u->{memsize} || $u->{memsize} =~ s/^(\d+)M?$/$1M/i or $o->ask_warn('', _("Give the ram size in MB")), return 1;
+ !$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('',