From 5fb90f8d684687e0066fd09a5a1b2d58d117b28d Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 6 Feb 2004 19:17:30 +0000 Subject: handle better bootloader per entries video mode --- perl-install/any.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'perl-install/any.pm') diff --git a/perl-install/any.pm b/perl-install/any.pm index ab57b6ec0..301709830 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -282,6 +282,7 @@ sub setupBootloader__entries { my $Modify = sub { my ($e) = @_; my $default = my $old_default = $e->{label} eq $b->{default}; + my $vga = $e->{vga} || 'normal'; my @l; if ($e->{type} eq "image") { @@ -290,7 +291,7 @@ sub setupBootloader__entries { { label => N("Root"), val => \$e->{root}, list => [ map { "/dev/$_->{device}" } @$fstab ], not_edit => !$::expert }, { label => N("Append"), val => \$e->{append} }, if_(arch() !~ /ppc|ia64/, -{ label => N("Video mode"), val => \$e->{vga}, list => [ keys %bootloader::vga_modes ], format => sub { $bootloader::vga_modes{$_[0]} }, not_edit => !$::expert, advanced => 1 }, +{ label => N("Video mode"), val => \$vga, list => [ keys %bootloader::vga_modes ], format => sub { $bootloader::vga_modes{$_[0]} }, not_edit => !$::expert, advanced => 1 }, ), { label => N("Initrd"), val => \$e->{initrd}, list => [ map { s/$::prefix//; $_ } glob_("$::prefix/boot/initrd*") ], not_edit => 0, advanced => 1 }, ); @@ -330,6 +331,7 @@ sub setupBootloader__entries { } } }, \@l) or return; $b->{default} = $old_default || $default ? $default && $e->{label} : $b->{default}; + $e->{vga} = $vga eq 'normal' ? '' : $vga; bootloader::configure_entry($e); #- hack to make sure initrd file are built. 1; }; -- cgit v1.2.1