Attachment 318127 Details for Bug 458576 – Fix both boot messages

[patch] Fix both boot messages

grub-fix-plymouth-patch.patch (text/plain), 1.23 KB, created by Ray Strode [halfline] on 2008-09-30 21:04:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ray Strode [halfline]

Created: 2008-09-30 21:04:35 UTC

Size: 1.23 KB

patch

obsolete

>diff -up grub-0.97/stage2/stage2.c.fix-plymouth-patch grub-0.97/stage2/stage2.c
>--- grub-0.97/stage2/stage2.c.fix-plymouth-patch	2008-09-30 17:00:18.000000000 -0400
>+++ grub-0.97/stage2/stage2.c	2008-09-30 17:00:58.000000000 -0400
>@@ -258,14 +258,19 @@ restart:
>      interface. */
>   if (grub_timeout < 0)
>     show_menu = 1;
>-  
>+
>   /* If SHOW_MENU is false, don't display the menu until ESC is pressed.  */
>   if (! show_menu)
>     {
>+      /* Don't show the "Booting in blah seconds message" if the timeout is 0 */
>+      int print_message = grub_timeout != 0;
>+
>       /* Get current time.  */
>       while ((time1 = getrtsecs ()) == 0xFF)
> 	;
>-      grub_verbose_printf("\rPress any key to enter the menu\n\n\n");
>+
>+      if (print_message)
>+	grub_printf("\rPress any key to enter the menu\n\n\n");
> 
>       while (1)
> 	{
>@@ -301,9 +306,10 @@ restart:
> 	      grub_timeout--;
> 	      
> 	      /* Print a message.  */
>-	      grub_verbose_printf ("\rBooting %s in %d seconds...",
>-				   get_entry(menu_entries, first_entry + entryno, 0),
>-				   grub_timeout);
>+	      if (print_message)
>+		grub_printf ("\rBooting %s in %d seconds...",
>+		             get_entry(menu_entries, first_entry + entryno, 0),
>+		             grub_timeout);
> 	    }
> 	}
>     }

Actions: View | Diff

Attachments on bug 458576: 314315 | 318087 | 318088 | 318127