proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-08-14 14:42:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Put the preprocessor definition for quiet-boot in the right place so

Browse Source 
that it actually takes effect.
This commit is contained in:
Colin Watson 2013-08-26 10:45:15 +02:00
parent eead0f03af
commit b6e77341d5
11 changed files with 64 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.h.in
View File

@ -41,6 +41,8 @@
#define NEED_REGISTER_FRAME_INFO @NEED_REGISTER_FRAME_INFO@ #define NEED_REGISTER_FRAME_INFO @NEED_REGISTER_FRAME_INFO@
/* Define to 1 to enable disk cache statistics. */ /* Define to 1 to enable disk cache statistics. */
#define DISK_CACHE_STATS @DISK_CACHE_STATS@ #define DISK_CACHE_STATS @DISK_CACHE_STATS@
/* Define to 1 to make GRUB quieter at boot time. */
#define QUIET_BOOT @QUIET_BOOT@
#define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@" #define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@"
#define GRUB_PLATFORM "@GRUB_PLATFORM@" #define GRUB_PLATFORM "@GRUB_PLATFORM@"

7
configure.ac
View File

@ -1081,10 +1081,11 @@ AC_ARG_ENABLE([quiet-boot],
[emit fewer messages at boot time (default=no)])], [emit fewer messages at boot time (default=no)])],
[], [enable_quiet_boot=no]) [], [enable_quiet_boot=no])
if test x"$enable_quiet_boot" = xyes ; then if test x"$enable_quiet_boot" = xyes ; then
AC_DEFINE([GRUB_QUIET_BOOT], [1], QUIET_BOOT=1
[Define to 1 to make GRUB quieter at boot time.]) else
QUIET_BOOT=0
fi fi
AC_SUBST([enable_quiet_boot]) AC_SUBST([QUIET_BOOT])
LIBS="" LIBS=""

2
debian/changelog vendored
View File

@ -1,6 +1,8 @@
grub2 (2.00-18) UNRELEASED; urgency=low grub2 (2.00-18) UNRELEASED; urgency=low
* Add gettext module to signed UEFI images (LP: #1104627). * Add gettext module to signed UEFI images (LP: #1104627).
* Put the preprocessor definition for quiet-boot in the right place so
that it actually takes effect.
-- Colin Watson <cjwatson@debian.org> Fri, 16 Aug 2013 08:56:52 +0100 -- Colin Watson <cjwatson@debian.org> Fri, 16 Aug 2013 08:56:52 +0100

62
debian/patches/maybe_quiet.patch vendored
View File

@ -25,13 +25,26 @@ Author: Colin Watson <cjwatson@ubuntu.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/386922 Bug-Ubuntu: https://bugs.launchpad.net/bugs/386922
Bug-Ubuntu: https://bugs.launchpad.net/bugs/861048 Bug-Ubuntu: https://bugs.launchpad.net/bugs/861048
Forwarded: (partial) http://lists.gnu.org/archive/html/grub-devel/2009-09/msg00056.html Forwarded: (partial) http://lists.gnu.org/archive/html/grub-devel/2009-09/msg00056.html
Last-Update: 2013-08-15 Last-Update: 2013-08-26
Index: b/config.h.in
===================================================================
--- a/config.h.in
+++ b/config.h.in
@@ -41,6 +41,8 @@
#define NEED_REGISTER_FRAME_INFO @NEED_REGISTER_FRAME_INFO@
/* Define to 1 to enable disk cache statistics. */
#define DISK_CACHE_STATS @DISK_CACHE_STATS@
+/* Define to 1 to make GRUB quieter at boot time. */
+#define QUIET_BOOT @QUIET_BOOT@
#define GRUB_TARGET_CPU "@GRUB_TARGET_CPU@"
#define GRUB_PLATFORM "@GRUB_PLATFORM@"
Index: b/configure.ac Index: b/configure.ac
=================================================================== ===================================================================
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1076,6 +1076,16 @@ @@ -1076,6 +1076,17 @@
AC_SUBST([LIBZFS]) AC_SUBST([LIBZFS])
AC_SUBST([LIBNVPAIR]) AC_SUBST([LIBNVPAIR])
@ -40,15 +53,16 @@ Index: b/configure.ac
+ [emit fewer messages at boot time (default=no)])], + [emit fewer messages at boot time (default=no)])],
+ [], [enable_quiet_boot=no]) + [], [enable_quiet_boot=no])
+if test x"$enable_quiet_boot" = xyes ; then +if test x"$enable_quiet_boot" = xyes ; then
+ AC_DEFINE([GRUB_QUIET_BOOT], [1], + QUIET_BOOT=1
+ [Define to 1 to make GRUB quieter at boot time.]) +else
+ QUIET_BOOT=0
+fi +fi
+AC_SUBST([enable_quiet_boot]) +AC_SUBST([QUIET_BOOT])
+ +
LIBS="" LIBS=""
AC_SUBST([FONT_SOURCE]) AC_SUBST([FONT_SOURCE])
@@ -1232,5 +1242,10 @@ @@ -1232,5 +1243,10 @@
else else
echo With libzfs support: No "($libzfs_excuse)" echo With libzfs support: No "($libzfs_excuse)"
fi fi
@ -67,7 +81,7 @@ Index: b/grub-core/boot/i386/pc/boot.S
#include <grub/symbol.h> #include <grub/symbol.h>
#include <grub/machine/boot.h> #include <grub/machine/boot.h>
+#ifdef GRUB_QUIET_BOOT +#ifdef QUIET_BOOT
+#include <grub/machine/memory.h> +#include <grub/machine/memory.h>
+#endif +#endif
@ -77,7 +91,7 @@ Index: b/grub-core/boot/i386/pc/boot.S
/* save drive reference first thing! */ /* save drive reference first thing! */
pushw %dx pushw %dx
+#ifdef GRUB_QUIET_BOOT +#ifdef QUIET_BOOT
+ /* is either shift key held down? */ + /* is either shift key held down? */
+ movw $(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx + movw $(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx
+ andb $3, (%bx) + andb $3, (%bx)
@ -99,7 +113,7 @@ Index: b/grub-core/boot/i386/pc/diskboot.S
#include <grub/symbol.h> #include <grub/symbol.h>
#include <grub/machine/boot.h> #include <grub/machine/boot.h>
+#ifdef GRUB_QUIET_BOOT +#ifdef QUIET_BOOT
+#include <grub/machine/memory.h> +#include <grub/machine/memory.h>
+#endif +#endif
@ -109,7 +123,7 @@ Index: b/grub-core/boot/i386/pc/diskboot.S
#define MSG(x) movw $x, %si; call LOCAL(message) #define MSG(x) movw $x, %si; call LOCAL(message)
+#ifdef GRUB_QUIET_BOOT +#ifdef QUIET_BOOT
+#define SILENT(x) call LOCAL(check_silent); jz LOCAL(x) +#define SILENT(x) call LOCAL(check_silent); jz LOCAL(x)
+#else +#else
+#define SILENT(x) +#define SILENT(x)
@ -160,7 +174,7 @@ Index: b/grub-core/boot/i386/pc/diskboot.S
/* go here when you need to stop the machine hard after an error condition */ /* go here when you need to stop the machine hard after an error condition */
LOCAL(stop): jmp LOCAL(stop) LOCAL(stop): jmp LOCAL(stop)
+#ifdef GRUB_QUIET_BOOT +#ifdef QUIET_BOOT
+LOCAL(check_silent): +LOCAL(check_silent):
+ /* is either shift key held down? */ + /* is either shift key held down? */
+ movw $(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx + movw $(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx
@ -179,14 +193,14 @@ Index: b/grub-core/kern/main.c
void __attribute__ ((noreturn)) void __attribute__ ((noreturn))
grub_main (void) grub_main (void)
{ {
+#ifdef GRUB_QUIET_BOOT +#ifdef QUIET_BOOT
+ struct grub_term_output *term; + struct grub_term_output *term;
+#endif +#endif
+ +
/* First of all, initialize the machine. */ /* First of all, initialize the machine. */
grub_machine_init (); grub_machine_init ();
+#ifdef GRUB_QUIET_BOOT +#ifdef QUIET_BOOT
+ /* Disable the cursor until we need it. */ + /* Disable the cursor until we need it. */
+ FOR_ACTIVE_TERM_OUTPUTS(term) + FOR_ACTIVE_TERM_OUTPUTS(term)
+ grub_term_setcursor (term, 0); + grub_term_setcursor (term, 0);
@ -204,7 +218,7 @@ Index: b/grub-core/kern/main.c
grub_load_config (); grub_load_config ();
grub_load_normal_mode (); grub_load_normal_mode ();
+ +
+#ifdef GRUB_QUIET_BOOT +#ifdef QUIET_BOOT
+ /* If we have to enter rescue mode, enable the cursor again. */ + /* If we have to enter rescue mode, enable the cursor again. */
+ FOR_ACTIVE_TERM_OUTPUTS(term) + FOR_ACTIVE_TERM_OUTPUTS(term)
+ grub_term_setcursor (term, 1); + grub_term_setcursor (term, 1);
@ -220,7 +234,7 @@ Index: b/grub-core/kern/rescue_reader.c
void __attribute__ ((noreturn)) void __attribute__ ((noreturn))
grub_rescue_run (void) grub_rescue_run (void)
{ {
+#ifdef GRUB_QUIET_BOOT +#ifdef QUIET_BOOT
grub_printf ("Entering rescue mode...\n"); grub_printf ("Entering rescue mode...\n");
+#endif +#endif
@ -234,7 +248,7 @@ Index: b/grub-core/normal/main.c
grub_normal_read_line_real (char **line, int cont, int nested) grub_normal_read_line_real (char **line, int cont, int nested)
{ {
const char *prompt; const char *prompt;
+#ifdef GRUB_QUIET_BOOT +#ifdef QUIET_BOOT
+ static int displayed_intro; + static int displayed_intro;
+ +
+ if (! displayed_intro) + if (! displayed_intro)
@ -250,7 +264,7 @@ Index: b/grub-core/normal/main.c
return; return;
} }
+#ifndef GRUB_QUIET_BOOT +#ifndef QUIET_BOOT
grub_normal_reader_init (nested); grub_normal_reader_init (nested);
+#endif +#endif
@ -266,13 +280,13 @@ Index: b/grub-core/normal/menu.c
static void static void
-notify_booting (grub_menu_entry_t entry, -notify_booting (grub_menu_entry_t entry,
+notify_booting (grub_menu_entry_t entry +notify_booting (grub_menu_entry_t entry
+#ifdef GRUB_QUIET_BOOT +#ifdef QUIET_BOOT
+ __attribute__((unused)) + __attribute__((unused))
+#endif +#endif
+ , + ,
void *userdata __attribute__((unused))) void *userdata __attribute__((unused)))
{ {
+#ifndef GRUB_QUIET_BOOT +#ifndef QUIET_BOOT
grub_printf (" "); grub_printf (" ");
grub_printf_ (N_("Booting `%s'"), entry->title); grub_printf_ (N_("Booting `%s'"), entry->title);
grub_printf ("\n\n"); grub_printf ("\n\n");
@ -284,7 +298,7 @@ Index: b/grub-core/normal/menu.c
int boot_entry; int boot_entry;
grub_menu_entry_t e; grub_menu_entry_t e;
int auto_boot; int auto_boot;
+#ifdef GRUB_QUIET_BOOT +#ifdef QUIET_BOOT
+ int initial_timeout = grub_menu_get_timeout (); + int initial_timeout = grub_menu_get_timeout ();
+#endif +#endif
@ -295,7 +309,7 @@ Index: b/grub-core/normal/menu.c
continue; /* Menu is empty. */ continue; /* Menu is empty. */
- grub_cls (); - grub_cls ();
+#ifdef GRUB_QUIET_BOOT +#ifdef QUIET_BOOT
+ /* Only clear the screen if we drew the menu in the first place. */ + /* Only clear the screen if we drew the menu in the first place. */
+ if (initial_timeout != 0) + if (initial_timeout != 0)
+#endif +#endif
@ -311,7 +325,7 @@ Index: b/util/grub.d/10_linux.in
prefix="@prefix@" prefix="@prefix@"
exec_prefix="@exec_prefix@" exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
+enable_quiet_boot="@enable_quiet_boot@" +quiet_boot="@QUIET_BOOT@"
. "@datadir@/@PACKAGE@/grub-mkconfig_lib" . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
@ -321,7 +335,7 @@ Index: b/util/grub.d/10_linux.in
fi fi
- message="$(gettext_printf "Loading Linux %s ..." ${version})" - message="$(gettext_printf "Loading Linux %s ..." ${version})"
- sed "s/^/$submenu_indentation/" << EOF - sed "s/^/$submenu_indentation/" << EOF
+ if [ x"$enable_quiet_boot" = xno ] || [ x"$type" != xsimple ]; then + if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
+ message="$(gettext_printf "Loading Linux %s ..." ${version})" + message="$(gettext_printf "Loading Linux %s ..." ${version})"
+ sed "s/^/$submenu_indentation/" << EOF + sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$message" | grub_quote)' echo '$(echo "$message" | grub_quote)'
@ -336,7 +350,7 @@ Index: b/util/grub.d/10_linux.in
# TRANSLATORS: ramdisk isn't identifier. Should be translated. # TRANSLATORS: ramdisk isn't identifier. Should be translated.
- message="$(gettext_printf "Loading initial ramdisk ...")" - message="$(gettext_printf "Loading initial ramdisk ...")"
- sed "s/^/$submenu_indentation/" << EOF - sed "s/^/$submenu_indentation/" << EOF
+ if [ x"$enable_quiet_boot" = xno ] || [ x"$type" != xsimple ]; then + if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
+ message="$(gettext_printf "Loading initial ramdisk ...")" + message="$(gettext_printf "Loading initial ramdisk ...")"
+ sed "s/^/$submenu_indentation/" << EOF + sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$message" | grub_quote)' echo '$(echo "$message" | grub_quote)'

4
grub-core/boot/i386/pc/boot.S
View File

@ -19,7 +19,7 @@
#include <grub/symbol.h> #include <grub/symbol.h>
#include <grub/machine/boot.h> #include <grub/machine/boot.h>
#ifdef GRUB_QUIET_BOOT #ifdef QUIET_BOOT
#include <grub/machine/memory.h> #include <grub/machine/memory.h>
#endif #endif
@ -153,7 +153,7 @@ real_start:
/* save drive reference first thing! */ /* save drive reference first thing! */
pushw %dx pushw %dx
#ifdef GRUB_QUIET_BOOT #ifdef QUIET_BOOT
/* is either shift key held down? */ /* is either shift key held down? */
movw $(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx movw $(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx
andb $3, (%bx) andb $3, (%bx)

6
grub-core/boot/i386/pc/diskboot.S
View File

@ -18,7 +18,7 @@
#include <grub/symbol.h> #include <grub/symbol.h>
#include <grub/machine/boot.h> #include <grub/machine/boot.h>
#ifdef GRUB_QUIET_BOOT #ifdef QUIET_BOOT
#include <grub/machine/memory.h> #include <grub/machine/memory.h>
#endif #endif
@ -28,7 +28,7 @@
#define MSG(x) movw $x, %si; call LOCAL(message) #define MSG(x) movw $x, %si; call LOCAL(message)
#ifdef GRUB_QUIET_BOOT #ifdef QUIET_BOOT
#define SILENT(x) call LOCAL(check_silent); jz LOCAL(x) #define SILENT(x) call LOCAL(check_silent); jz LOCAL(x)
#else #else
#define SILENT(x) #define SILENT(x)
@ -338,7 +338,7 @@ LOCAL(general_error):
/* go here when you need to stop the machine hard after an error condition */ /* go here when you need to stop the machine hard after an error condition */
LOCAL(stop): jmp LOCAL(stop) LOCAL(stop): jmp LOCAL(stop)
#ifdef GRUB_QUIET_BOOT #ifdef QUIET_BOOT
LOCAL(check_silent): LOCAL(check_silent):
/* is either shift key held down? */ /* is either shift key held down? */
movw $(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx movw $(GRUB_MEMORY_MACHINE_BIOS_DATA_AREA_ADDR + 0x17), %bx

6
grub-core/kern/main.c
View File

@ -207,14 +207,14 @@ grub_load_normal_mode (void)
void __attribute__ ((noreturn)) void __attribute__ ((noreturn))
grub_main (void) grub_main (void)
{ {
#ifdef GRUB_QUIET_BOOT #ifdef QUIET_BOOT
struct grub_term_output *term; struct grub_term_output *term;
#endif #endif
/* First of all, initialize the machine. */ /* First of all, initialize the machine. */
grub_machine_init (); grub_machine_init ();
#ifdef GRUB_QUIET_BOOT #ifdef QUIET_BOOT
/* Disable the cursor until we need it. */ /* Disable the cursor until we need it. */
FOR_ACTIVE_TERM_OUTPUTS(term) FOR_ACTIVE_TERM_OUTPUTS(term)
grub_term_setcursor (term, 0); grub_term_setcursor (term, 0);
@ -243,7 +243,7 @@ grub_main (void)
grub_load_config (); grub_load_config ();
grub_load_normal_mode (); grub_load_normal_mode ();
#ifdef GRUB_QUIET_BOOT #ifdef QUIET_BOOT
/* If we have to enter rescue mode, enable the cursor again. */ /* If we have to enter rescue mode, enable the cursor again. */
FOR_ACTIVE_TERM_OUTPUTS(term) FOR_ACTIVE_TERM_OUTPUTS(term)
grub_term_setcursor (term, 1); grub_term_setcursor (term, 1);

2
grub-core/kern/rescue_reader.c
View File

@ -77,7 +77,7 @@ grub_rescue_read_line (char **line, int cont)
void __attribute__ ((noreturn)) void __attribute__ ((noreturn))
grub_rescue_run (void) grub_rescue_run (void)
{ {
#ifdef GRUB_QUIET_BOOT #ifdef QUIET_BOOT
grub_printf ("Entering rescue mode...\n"); grub_printf ("Entering rescue mode...\n");
#endif #endif

4
grub-core/normal/main.c
View File

@ -399,7 +399,7 @@ static grub_err_t
grub_normal_read_line_real (char **line, int cont, int nested) grub_normal_read_line_real (char **line, int cont, int nested)
{ {
const char *prompt; const char *prompt;
#ifdef GRUB_QUIET_BOOT #ifdef QUIET_BOOT
static int displayed_intro; static int displayed_intro;
if (! displayed_intro) if (! displayed_intro)
@ -455,7 +455,7 @@ grub_cmdline_run (int nested)
return; return;
} }
#ifndef GRUB_QUIET_BOOT #ifndef QUIET_BOOT
grub_normal_reader_init (nested); grub_normal_reader_init (nested);
#endif #endif

8
grub-core/normal/menu.c
View File

@ -670,13 +670,13 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
/* Callback invoked immediately before a menu entry is executed. */ /* Callback invoked immediately before a menu entry is executed. */
static void static void
notify_booting (grub_menu_entry_t entry notify_booting (grub_menu_entry_t entry
#ifdef GRUB_QUIET_BOOT #ifdef QUIET_BOOT
__attribute__((unused)) __attribute__((unused))
#endif #endif
, ,
void *userdata __attribute__((unused))) void *userdata __attribute__((unused)))
{ {
#ifndef GRUB_QUIET_BOOT #ifndef QUIET_BOOT
grub_printf (" "); grub_printf (" ");
grub_printf_ (N_("Booting `%s'"), entry->title); grub_printf_ (N_("Booting `%s'"), entry->title);
grub_printf ("\n\n"); grub_printf ("\n\n");
@ -728,7 +728,7 @@ show_menu (grub_menu_t menu, int nested, int autobooted)
int boot_entry; int boot_entry;
grub_menu_entry_t e; grub_menu_entry_t e;
int auto_boot; int auto_boot;
#ifdef GRUB_QUIET_BOOT #ifdef QUIET_BOOT
int initial_timeout = grub_menu_get_timeout (); int initial_timeout = grub_menu_get_timeout ();
#endif #endif
@ -740,7 +740,7 @@ show_menu (grub_menu_t menu, int nested, int autobooted)
if (! e) if (! e)
continue; /* Menu is empty. */ continue; /* Menu is empty. */
#ifdef GRUB_QUIET_BOOT #ifdef QUIET_BOOT
/* Only clear the screen if we drew the menu in the first place. */ /* Only clear the screen if we drew the menu in the first place. */
if (initial_timeout != 0) if (initial_timeout != 0)
#endif #endif

6
util/grub.d/10_linux.in
View File

@ -20,7 +20,7 @@ set -e
prefix="@prefix@" prefix="@prefix@"
exec_prefix="@exec_prefix@" exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@" datarootdir="@datarootdir@"
enable_quiet_boot="@enable_quiet_boot@" quiet_boot="@QUIET_BOOT@"
. "@datadir@/@PACKAGE@/grub-mkconfig_lib" . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
@ -141,7 +141,7 @@ linux_entry ()
fi fi
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
fi fi
if [ x"$enable_quiet_boot" = xno ] || [ x"$type" != xsimple ]; then if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
message="$(gettext_printf "Loading Linux %s ..." ${version})" message="$(gettext_printf "Loading Linux %s ..." ${version})"
sed "s/^/$submenu_indentation/" << EOF sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$message" | grub_quote)' echo '$(echo "$message" | grub_quote)'
@ -158,7 +158,7 @@ EOF
fi fi
if test -n "${initrd}" ; then if test -n "${initrd}" ; then
# TRANSLATORS: ramdisk isn't identifier. Should be translated. # TRANSLATORS: ramdisk isn't identifier. Should be translated.
if [ x"$enable_quiet_boot" = xno ] || [ x"$type" != xsimple ]; then if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
message="$(gettext_printf "Loading initial ramdisk ...")" message="$(gettext_printf "Loading initial ramdisk ...")"
sed "s/^/$submenu_indentation/" << EOF sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$message" | grub_quote)' echo '$(echo "$message" | grub_quote)'