[grub2/f19] Add a patch to make the boot a bit quieter
Peter Jones
pjones at fedoraproject.org
Fri Jun 7 18:25:42 UTC 2013
commit 3a1a6259bc45608b3e0f0a68eba1bbb23266ff4e
Author: William Jon McCann <william.jon.mccann at gmail.com>
Date: Tue Mar 12 10:37:58 2013 -0400
Add a patch to make the boot a bit quieter
grub-2.00-quiet-boot.patch | 156 ++++++++++++++++++++++++++++++++++++++++++++
grub2.spec | 1 +
2 files changed, 157 insertions(+), 0 deletions(-)
---
diff --git a/grub-2.00-quiet-boot.patch b/grub-2.00-quiet-boot.patch
new file mode 100644
index 0000000..860bbf1
--- /dev/null
+++ b/grub-2.00-quiet-boot.patch
@@ -0,0 +1,156 @@
+From 2736f156ba9977bb59f42d6c206a22429dad3daf Mon Sep 17 00:00:00 2001
+From: Fedora Ninjas <grub2-owner at fedoraproject.org>
+Date: Wed, 15 May 2013 13:30:20 -0400
+Subject: [PATCH] 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 | 14 --------------
+ grub-core/kern/main.c | 5 -----
+ util/grub.d/10_linux.in | 6 ------
+ 5 files changed, 33 deletions(-)
+
+diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
+index c0880c6..f45b982 100644
+--- a/grub-core/boot/i386/pc/boot.S
++++ b/grub-core/boot/i386/pc/boot.S
+@@ -242,9 +242,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 d030a14..a494d02 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 569f985..fa32ced 100644
+--- a/grub-core/gettext/gettext.c
++++ b/grub-core/gettext/gettext.c
+@@ -422,13 +422,9 @@ grub_gettext_env_write_lang (struct grub_env_var *var
+ grub_err_t 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);
+ }
+@@ -440,8 +436,6 @@ grub_gettext_reread_prefix (const char *val)
+ err = grub_gettext_init_ext (&main_context, grub_env_get ("lang"),
+ grub_env_get ("locale_dir"),
+ val);
+- if (err)
+- grub_print_error ();
+ }
+
+ static char *
+@@ -451,8 +445,6 @@ read_main (struct grub_env_var *var
+ grub_err_t 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);
+ }
+
+@@ -463,8 +455,6 @@ read_secondary (struct grub_env_var *var
+ grub_err_t err;
+ err = grub_gettext_init_ext (&secondary_context, grub_env_get ("lang"), val,
+ 0);
+- if (err)
+- grub_print_error ();
+
+ return grub_strdup (val);
+ }
+@@ -491,12 +481,8 @@ GRUB_MOD_INIT (gettext)
+
+ 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 d7ea670..83b0c70 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -132,10 +132,8 @@ 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
+@@ -145,16 +143,12 @@ EOF
+ 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
+--
+1.8.2.1
+
+
diff --git a/grub2.spec b/grub2.spec
index 8c2564d..2c676e0 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -418,6 +418,7 @@ Patch0363: 0363-Move-bash-completion-script-922997.patch
Patch0364: 0002-configure.ac-Don-t-use-extended-registers-on-x86_64.patch
Patch0365: 0003-configure.ac-Don-t-disable-extended-registers-on-emu.patch
Patch0366: 0004-conf-Makefile.common-Poison-float-and-double-on-non-.patch
+Patch0367: grub-2.00-quiet-boot.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
More information about the scm-commits
mailing list