summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-08 11:53:43 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-08 11:53:43 +0000
commit48cded0deb38fd40bf736b1f890142c6c84add7e (patch)
treeb88300c2fcd4c7e201f6ca1eb11dfa5b18f4358e /perl-install
parenta4b490c073a71bfdcc1d8df8efae320899d3551d (diff)
downloaddrakx-48cded0deb38fd40bf736b1f890142c6c84add7e.tar
drakx-48cded0deb38fd40bf736b1f890142c6c84add7e.tar.gz
drakx-48cded0deb38fd40bf736b1f890142c6c84add7e.tar.bz2
drakx-48cded0deb38fd40bf736b1f890142c6c84add7e.tar.xz
drakx-48cded0deb38fd40bf736b1f890142c6c84add7e.zip
- simplify lilo boot message. Not mentioning the timeout parameter fixes bugzilla #5429
- remove /boot/grub/messages and don't use the i18n command which are obsolete since grub doesn't handle it anymore
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootloader.pm25
1 files changed, 3 insertions, 22 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 51b59c34d..03036ab20 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -533,16 +533,16 @@ sub suggest {
if (!$bootloader->{message} || $bootloader->{message} eq "1") {
my $msg_en =
#-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-N_("Welcome to %s the operating system chooser!
+N_("Welcome to the operating system chooser!
Choose an operating system from the list above or
-wait %d seconds for default boot.
+wait for default boot.
");
my $msg = translate($msg_en);
#- use the english version if more than 20% of 8bits chars
$msg = $msg_en if int(grep { $_ & 0x80 } unpack "c*", $msg) / length($msg) > 0.2;
- $bootloader->{message} = sprintf $msg, arch() =~ /sparc/ ? "SILO" : "LILO", $bootloader->{timeout};
+ $bootloader->{message} = $msg;
}
add2hash_($bootloader, { memsize => $1 }) if cat_("/proc/cmdline") =~ /\bmem=(\d+[KkMm]?)(?:\s.*)?$/;
@@ -1093,7 +1093,6 @@ sub write_grub_config {
$bootloader->{$_} and print F "$_ $bootloader->{$_}" foreach qw(timeout);
print F "color black/cyan yellow/cyan";
- print F "i18n ", $file2grub->("/boot/grub/messages");
print F "keytable ", $file2grub->($bootloader->{keytable}) if $bootloader->{keytable};
print F "serial --unit=$1 --speed=$2\nterminal --timeout=" . ($bootloader->{timeout} || 0) . " console serial" if get_append($bootloader, 'console') =~ /ttyS(\d),(\d+)/;
@@ -1140,24 +1139,6 @@ install $s1 d $dev $s2 p $m
quit
EOF
";
-
- output "$::prefix/boot/grub/messages", map { substr(translate($_) . "\n", 0, 78) } ( #- ensure the translated messages are not too big the hard way
-#-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#-PO: and keep them smaller than 79 chars long
-N_("Welcome to GRUB the operating system chooser!"),
-#-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#-PO: and keep them smaller than 79 chars long
-N_("Use the %c and %c keys for selecting which entry is highlighted."),
-#-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#-PO: and keep them smaller than 79 chars long
-N_("Press enter to boot the selected OS, 'e' to edit the"),
-#-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#-PO: and keep them smaller than 79 chars long
-N_("commands before booting, or 'c' for a command-line."),
-#-PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#-PO: and keep them smaller than 79 chars long
-N_("The highlighted entry will be booted automatically in %d seconds."),
-);
my $e = "$::prefix/boot/.enough_space";
output $e, 1; -s $e or die \N("not enough room in /boot");