|
 |
31004e6 |
From 4bd4022c48a2086b78725859f4c6f61aac5660c6 Mon Sep 17 00:00:00 2001
|
|
|
31004e6 |
From: William Jon McCann <william.jon.mccann@gmail.com>
|
|
|
31004e6 |
Date: Wed, 15 May 2013 13:30:20 -0400
|
|
|
31004e6 |
Subject: [PATCH 468/471] Don't write messages to the screen
|
|
|
31004e6 |
|
|
|
31004e6 |
Writing messages to the screen before the menus or boot splash
|
|
|
31004e6 |
happens so quickly it looks like something is wrong and isn't
|
|
|
31004e6 |
very appealing.
|
|
|
31004e6 |
---
|
|
|
31004e6 |
grub-core/boot/i386/pc/boot.S | 3 ---
|
|
|
31004e6 |
grub-core/boot/i386/pc/diskboot.S | 5 -----
|
|
|
31004e6 |
grub-core/gettext/gettext.c | 15 ---------------
|
|
|
31004e6 |
grub-core/kern/main.c | 5 -----
|
|
|
31004e6 |
util/grub.d/10_linux.in | 7 -------
|
|
|
31004e6 |
5 files changed, 35 deletions(-)
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
|
|
|
31004e6 |
index c0880c6..f45b982 100644
|
|
|
31004e6 |
--- a/grub-core/boot/i386/pc/boot.S
|
|
|
31004e6 |
+++ b/grub-core/boot/i386/pc/boot.S
|
|
|
31004e6 |
@@ -242,9 +242,6 @@ real_start:
|
|
|
31004e6 |
/* save drive reference first thing! */
|
|
|
31004e6 |
pushw %dx
|
|
|
31004e6 |
|
|
|
31004e6 |
- /* print a notification message on the screen */
|
|
|
31004e6 |
- MSG(notification_string)
|
|
|
31004e6 |
-
|
|
|
31004e6 |
/* set %si to the disk address packet */
|
|
|
31004e6 |
movw $disk_address_packet, %si
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
|
|
|
31004e6 |
index d030a14..a494d02 100644
|
|
|
31004e6 |
--- a/grub-core/boot/i386/pc/diskboot.S
|
|
|
31004e6 |
+++ b/grub-core/boot/i386/pc/diskboot.S
|
|
|
31004e6 |
@@ -50,11 +50,6 @@ _start:
|
|
|
31004e6 |
/* save drive reference first thing! */
|
|
|
31004e6 |
pushw %dx
|
|
|
31004e6 |
|
|
|
31004e6 |
- /* print a notification message on the screen */
|
|
|
31004e6 |
- pushw %si
|
|
|
31004e6 |
- MSG(notification_string)
|
|
|
31004e6 |
- popw %si
|
|
|
31004e6 |
-
|
|
|
31004e6 |
/* this sets up for the first run through "bootloop" */
|
|
|
31004e6 |
movw $LOCAL(firstlist), %di
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
|
|
|
31004e6 |
index 259251d..c06358c 100644
|
|
|
31004e6 |
--- a/grub-core/gettext/gettext.c
|
|
|
31004e6 |
+++ b/grub-core/gettext/gettext.c
|
|
|
31004e6 |
@@ -433,13 +433,9 @@ grub_gettext_env_write_lang (struct grub_env_var *var
|
|
|
31004e6 |
grub_err_t err;
|
|
|
31004e6 |
err = grub_gettext_init_ext (&main_context, val, grub_env_get ("locale_dir"),
|
|
|
31004e6 |
grub_env_get ("prefix"));
|
|
|
31004e6 |
- if (err)
|
|
|
31004e6 |
- grub_print_error ();
|
|
|
31004e6 |
|
|
|
31004e6 |
err = grub_gettext_init_ext (&secondary_context, val,
|
|
|
31004e6 |
grub_env_get ("secondary_locale_dir"), 0);
|
|
|
31004e6 |
- if (err)
|
|
|
31004e6 |
- grub_print_error ();
|
|
|
31004e6 |
|
|
|
31004e6 |
return grub_strdup (val);
|
|
|
31004e6 |
}
|
|
|
31004e6 |
@@ -451,8 +447,6 @@ grub_gettext_reread_prefix (const char *val)
|
|
|
31004e6 |
err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"),
|
|
|
31004e6 |
grub_env_get ("locale_dir"),
|
|
|
31004e6 |
val);
|
|
|
31004e6 |
- if (err)
|
|
|
31004e6 |
- grub_print_error ();
|
|
|
31004e6 |
}
|
|
|
31004e6 |
|
|
|
31004e6 |
static char *
|
|
|
31004e6 |
@@ -462,8 +456,6 @@ read_main (struct grub_env_var *var
|
|
|
31004e6 |
grub_err_t err;
|
|
|
31004e6 |
err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"), val,
|
|
|
31004e6 |
grub_env_get ("prefix"));
|
|
|
31004e6 |
- if (err)
|
|
|
31004e6 |
- grub_print_error ();
|
|
|
31004e6 |
return grub_strdup (val);
|
|
|
31004e6 |
}
|
|
|
31004e6 |
|
|
|
31004e6 |
@@ -474,9 +466,6 @@ read_secondary (struct grub_env_var *var
|
|
|
31004e6 |
grub_err_t err;
|
|
|
31004e6 |
err = grub_gettext_init_ext (&secondary_context, grub_env_get ("lang"), val,
|
|
|
31004e6 |
0);
|
|
|
31004e6 |
- if (err)
|
|
|
31004e6 |
- grub_print_error ();
|
|
|
31004e6 |
-
|
|
|
31004e6 |
return grub_strdup (val);
|
|
|
31004e6 |
}
|
|
|
31004e6 |
|
|
|
31004e6 |
@@ -502,12 +491,8 @@ GRUB_MOD_INIT (gettext)
|
|
|
31004e6 |
|
|
|
31004e6 |
err = grub_gettext_init_ext (&main_context, lang, grub_env_get ("locale_dir"),
|
|
|
31004e6 |
grub_env_get ("prefix"));
|
|
|
31004e6 |
- if (err)
|
|
|
31004e6 |
- grub_print_error ();
|
|
|
31004e6 |
err = grub_gettext_init_ext (&secondary_context, lang,
|
|
|
31004e6 |
grub_env_get ("secondary_locale_dir"), 0);
|
|
|
31004e6 |
- if (err)
|
|
|
31004e6 |
- grub_print_error ();
|
|
|
31004e6 |
|
|
|
31004e6 |
grub_register_variable_hook ("locale_dir", NULL, read_main);
|
|
|
31004e6 |
grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary);
|
|
|
31004e6 |
diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
|
|
|
31004e6 |
index 8ab7794..da47b18 100644
|
|
|
31004e6 |
--- a/grub-core/kern/main.c
|
|
|
31004e6 |
+++ b/grub-core/kern/main.c
|
|
|
31004e6 |
@@ -268,11 +268,6 @@ grub_main (void)
|
|
|
31004e6 |
|
|
|
31004e6 |
grub_boot_time ("After machine init.");
|
|
|
31004e6 |
|
|
|
31004e6 |
- /* Hello. */
|
|
|
31004e6 |
- grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT);
|
|
|
31004e6 |
- grub_printf ("Welcome to GRUB!\n\n");
|
|
|
31004e6 |
- grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
|
|
|
31004e6 |
-
|
|
|
31004e6 |
grub_load_config ();
|
|
|
31004e6 |
|
|
|
31004e6 |
grub_boot_time ("Before loading embedded modules.");
|
|
|
31004e6 |
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
|
31004e6 |
index d7ea670..5ed7695 100644
|
|
|
31004e6 |
--- a/util/grub.d/10_linux.in
|
|
|
31004e6 |
+++ b/util/grub.d/10_linux.in
|
|
|
31004e6 |
@@ -132,29 +132,22 @@ linux_entry ()
|
|
|
31004e6 |
fi
|
|
|
31004e6 |
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
|
|
|
31004e6 |
fi
|
|
|
31004e6 |
- message="$(gettext_printf "Loading Linux %s ..." ${version})"
|
|
|
31004e6 |
if [ -d /sys/firmware/efi ]; then
|
|
|
31004e6 |
sed "s/^/$submenu_indentation/" << EOF
|
|
|
31004e6 |
- echo '$(echo "$message" | grub_quote)'
|
|
|
31004e6 |
linuxefi ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
|
|
|
31004e6 |
EOF
|
|
|
31004e6 |
else
|
|
|
31004e6 |
sed "s/^/$submenu_indentation/" << EOF
|
|
|
31004e6 |
- echo '$(echo "$message" | grub_quote)'
|
|
|
31004e6 |
linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
|
|
|
31004e6 |
EOF
|
|
|
31004e6 |
fi
|
|
|
31004e6 |
if test -n "${initrd}" ; then
|
|
|
31004e6 |
- # TRANSLATORS: ramdisk isn't identifier. Should be translated.
|
|
|
31004e6 |
- message="$(gettext_printf "Loading initial ramdisk ...")"
|
|
|
31004e6 |
if [ -d /sys/firmware/efi ]; then
|
|
|
31004e6 |
sed "s/^/$submenu_indentation/" << EOF
|
|
|
31004e6 |
- echo '$(echo "$message" | grub_quote)'
|
|
|
31004e6 |
initrdefi ${rel_dirname}/${initrd}
|
|
|
31004e6 |
EOF
|
|
|
31004e6 |
else
|
|
|
31004e6 |
sed "s/^/$submenu_indentation/" << EOF
|
|
|
31004e6 |
- echo '$message'
|
|
|
31004e6 |
initrd ${rel_dirname}/${initrd}
|
|
|
31004e6 |
EOF
|
|
|
31004e6 |
fi
|
|
|
31004e6 |
--
|
|
|
31004e6 |
1.8.2.1
|
|
|
31004e6 |
|