summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-02-15 13:29:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-02-15 13:29:21 +0000
commitaf185ba215272ffbafa713f1bea3949e98023967 (patch)
treeb05ad55f1e781f3cd7e01cbb7d072307b33c2c86 /perl-install
parent6f6740ad5cc6c0d60440c8a2cece76b9c7b2bf0c (diff)
downloaddrakx-backup-do-not-use-af185ba215272ffbafa713f1bea3949e98023967.tar
drakx-backup-do-not-use-af185ba215272ffbafa713f1bea3949e98023967.tar.gz
drakx-backup-do-not-use-af185ba215272ffbafa713f1bea3949e98023967.tar.bz2
drakx-backup-do-not-use-af185ba215272ffbafa713f1bea3949e98023967.tar.xz
drakx-backup-do-not-use-af185ba215272ffbafa713f1bea3949e98023967.zip
use 'combo' instead of 'type' for bootloader choice and security choice
(requested by fredb&dadou)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 641fb8679..8d61d685d 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -160,7 +160,7 @@ sub setupBootloader {
$b->{vga} ||= 'normal';
if (arch !~ /ppc/) {
$in->ask_from('', _("Bootloader main options"), [
-{ label => _("Bootloader to use"), val => \$bootloader, list => [ keys(%bootloaders) ], format => \&translate, type => 'list' },
+{ label => _("Bootloader to use"), val => \$bootloader, list => [ keys(%bootloaders) ], format => \&translate },
arch() =~ /sparc/ ? (
{ label => _("Bootloader installation"), val => \$silo_install_lang, list => \@silo_install_lang },
) : if_(arch() !~ /ia64/,
@@ -192,7 +192,7 @@ sub setupBootloader {
} else {
$b->{boot} = $partition_table_mac::bootstrap_part;
$in->ask_from('', _("Bootloader main options"), [
- { label => _("Bootloader to use"), val => \$bootloader, list => [ keys(%bootloaders) ], format => \&translate, type => 'list' },
+ { label => _("Bootloader to use"), val => \$bootloader, list => [ keys(%bootloaders) ], format => \&translate },
{ label => _("Init Message"), val => \$b->{initmsg} },
{ label => _("Boot device"), val => \$b->{boot}, list => [ map { "/dev/$_" } (map { $_->{device} } (grep { isAppleBootstrap($_) } @$fstab))], not_edit => !$::expert },
{ label => _("Open Firmware Delay"), val => \$b->{delay} },
@@ -1023,7 +1023,7 @@ Security features are at their maximum.")),
$in->ask_from('', _("Choose security level") . "\n\n" .
join('', map { "$l{$_}: $help{$_}\n\n" } keys %l),
[
- { label => _("Security level"), val => $security, list => [ sort keys %l ], format => sub { $l{$_} }, type => 'list' },
+ { label => _("Security level"), val => $security, list => [ sort keys %l ], format => sub { $l{$_} } },
if_($in->do_pkgs->is_installed('libsafe') && arch() =~ /^i.86/,
{ label => _("Use libsafe for servers"), val => $libsafe, type => 'bool', text =>
_("A library which defends against buffer overflow and format string attacks.") }