dcavalca / rpms / grub2

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