From 0b4548eb7f9c6f9d5b2ca5650f404a55bc3c0e9b Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Wed, 15 May 2013 13:30:20 -0400 Subject: [PATCH 26/88] Don't write messages to the screen Writing messages to the screen before the menus or boot splash happens so quickly it looks like something is wrong and isn't very appealing. --- grub-core/boot/i386/pc/boot.S | 3 --- grub-core/boot/i386/pc/diskboot.S | 5 ----- grub-core/gettext/gettext.c | 25 +++++-------------------- grub-core/kern/main.c | 5 ----- util/grub.d/10_linux.in | 7 ------- 5 files changed, 5 insertions(+), 40 deletions(-) diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S index 2bd0b2d..ea167fe 100644 --- a/grub-core/boot/i386/pc/boot.S +++ b/grub-core/boot/i386/pc/boot.S @@ -249,9 +249,6 @@ real_start: /* save drive reference first thing! */ pushw %dx - /* print a notification message on the screen */ - MSG(notification_string) - /* set %si to the disk address packet */ movw $disk_address_packet, %si diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S index 1ee4cf5..c8b87ed 100644 --- a/grub-core/boot/i386/pc/diskboot.S +++ b/grub-core/boot/i386/pc/diskboot.S @@ -50,11 +50,6 @@ _start: /* save drive reference first thing! */ pushw %dx - /* print a notification message on the screen */ - pushw %si - MSG(notification_string) - popw %si - /* this sets up for the first run through "bootloop" */ movw $LOCAL(firstlist), %di diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c index 4880cef..b22e1bc 100644 --- a/grub-core/gettext/gettext.c +++ b/grub-core/gettext/gettext.c @@ -434,16 +434,12 @@ static char * grub_gettext_env_write_lang (struct grub_env_var *var __attribute__ ((unused)), const char *val) { - grub_err_t err; + grub_err_t __attribute__((__unused__)) err; err = grub_gettext_init_ext (&main_context, val, grub_env_get ("locale_dir"), grub_env_get ("prefix")); - if (err) - grub_print_error (); err = grub_gettext_init_ext (&secondary_context, val, grub_env_get ("secondary_locale_dir"), 0); - if (err) - grub_print_error (); return grub_strdup (val); } @@ -451,23 +447,19 @@ grub_gettext_env_write_lang (struct grub_env_var *var void grub_gettext_reread_prefix (const char *val) { - grub_err_t err; + grub_err_t __attribute__((__unused__)) err; err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"), grub_env_get ("locale_dir"), val); - if (err) - grub_print_error (); } static char * read_main (struct grub_env_var *var __attribute__ ((unused)), const char *val) { - grub_err_t err; + grub_err_t __attribute__((__unused__)) err; err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"), val, grub_env_get ("prefix")); - if (err) - grub_print_error (); return grub_strdup (val); } @@ -475,12 +467,9 @@ static char * read_secondary (struct grub_env_var *var __attribute__ ((unused)), const char *val) { - grub_err_t err; + grub_err_t __attribute__((__unused__)) err; err = grub_gettext_init_ext (&secondary_context, grub_env_get ("lang"), val, 0); - if (err) - grub_print_error (); - return grub_strdup (val); } @@ -500,18 +489,14 @@ grub_cmd_translate (grub_command_t cmd __attribute__ ((unused)), GRUB_MOD_INIT (gettext) { const char *lang; - grub_err_t err; + grub_err_t __attribute__((__unused__)) err; lang = grub_env_get ("lang"); err = grub_gettext_init_ext (&main_context, lang, grub_env_get ("locale_dir"), grub_env_get ("prefix")); - if (err) - grub_print_error (); err = grub_gettext_init_ext (&secondary_context, lang, grub_env_get ("secondary_locale_dir"), 0); - if (err) - grub_print_error (); grub_register_variable_hook ("locale_dir", NULL, read_main); grub_register_variable_hook ("secondary_locale_dir", NULL, read_secondary); diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c index 8ab7794..da47b18 100644 --- a/grub-core/kern/main.c +++ b/grub-core/kern/main.c @@ -268,11 +268,6 @@ grub_main (void) grub_boot_time ("After machine init."); - /* Hello. */ - grub_setcolorstate (GRUB_TERM_COLOR_HIGHLIGHT); - grub_printf ("Welcome to GRUB!\n\n"); - grub_setcolorstate (GRUB_TERM_COLOR_STANDARD); - grub_load_config (); grub_boot_time ("Before loading embedded modules."); diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in index 8ccf012..a3d9711 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -128,29 +128,22 @@ linux_entry () fi printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" fi - message="$(gettext_printf "Loading Linux %s ..." ${version})" if [ -d /sys/firmware/efi ]; then sed "s/^/$submenu_indentation/" << EOF - echo '$(echo "$message" | grub_quote)' linuxefi ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} EOF else sed "s/^/$submenu_indentation/" << EOF - echo '$(echo "$message" | grub_quote)' linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} EOF fi if test -n "${initrd}" ; then - # TRANSLATORS: ramdisk isn't identifier. Should be translated. - message="$(gettext_printf "Loading initial ramdisk ...")" if [ -d /sys/firmware/efi ]; then sed "s/^/$submenu_indentation/" << EOF - echo '$(echo "$message" | grub_quote)' initrdefi ${rel_dirname}/${initrd} EOF else sed "s/^/$submenu_indentation/" << EOF - echo '$message' initrd ${rel_dirname}/${initrd} EOF fi -- 2.5.5