diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-09-25 17:57:19 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-09-25 17:57:19 +0000 |
| commit | 5bebc55d66f0f25d830bc0be72c87e45cc8c8782 (patch) | |
| tree | 3bf67ca158ecdb4117db7d2d0656b2219b723e4b | |
| parent | 80e027c030f66e961d15bd8f2a6d6e57b5363625 (diff) | |
| download | drakx-5bebc55d66f0f25d830bc0be72c87e45cc8c8782.tar drakx-5bebc55d66f0f25d830bc0be72c87e45cc8c8782.tar.gz drakx-5bebc55d66f0f25d830bc0be72c87e45cc8c8782.tar.bz2 drakx-5bebc55d66f0f25d830bc0be72c87e45cc8c8782.tar.xz drakx-5bebc55d66f0f25d830bc0be72c87e45cc8c8782.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/ChangeLog | 1 | ||||
| -rw-r--r-- | perl-install/any.pm | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 4 |
3 files changed, 7 insertions, 0 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 351974ae1..a117edcce 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,5 +1,6 @@ 2000-09-25 François Pons <fpons@mandrakesoft.com> + * bootloader.pm: add Video mode for entry. * fs.pm: updated for live upgrade. * install2.pm: dropped unuseful steps filtering. * install_any.pm: fixed wrong Device3Dfx package name and clean diff --git a/perl-install/any.pm b/perl-install/any.pm index ca533b787..f6220f4bb 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -196,6 +196,7 @@ You can add some more or change the existing ones."), _("Image") => { val => \$e->{kernel_or_dev}, list => [ map { s/$prefix//; $_ } glob_("$prefix/boot/vmlinuz*") ], not_edit => 0 }, _("Root") => { val => \$e->{root}, list => [ map { "/dev/$_->{device}" } @$fstab ], not_edit => !$::expert }, _("Append") => \$e->{append}, +_("Video mode") => { val => \$e->{vga}, list => [ keys %bootloader::vga_modes ], not_edit => !$::expert }, _("Initrd") => { val => \$e->{initrd}, list => [ map { s/$prefix//; $_ } glob_("$prefix/boot/initrd*") ] }, _("Read-write") => { val => \$e->{'read-write'}, type => 'bool' } ); @@ -224,6 +225,7 @@ _("Default") => { val => \$default, type => 'bool' }, 0; })) { $b->{default} = $old_default || $default ? $default && $e->{label} : $b->{default}; + $e->{vga} = $bootloader::vga_modes{$e->{vga}} || $e->{vga}; require bootloader; bootloader::configure_entry($prefix, $e); #- hack to make sure initrd file are built. diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 981b9d134..ae0a20fa6 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -30,6 +30,10 @@ use modules; "80x34" => '0x0f05', "80x60" => '0x0f06', "100x30" => '0x0122', + "640x480 in 16 bits (FrameBuffer only)" => 785, + "800x600 in 16 bits (FrameBuffer only)" => 788, + "1024x768 in 16 bits (FrameBuffer only)" => 791, + "1280x1024 in 16 bits (FrameBuffer only)" => 794, ); my %vga_modes2nb = ( |