rpms/grub/F-10 grub-keystatus.patch,1.1,1.2 grub.spec,1.78,1.79

[Peter Jones]

Author: pjones

Update of /cvs/extras/rpms/grub/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11773

Modified Files:
	grub-keystatus.patch grub.spec 
Log Message:
* Tue Nov 18 2008 Peter Jones <pjones at redhat.com> - 0.97-38
- Put back the accidentally removed fix for rhbz#458576 .


grub-keystatus.patch:

Index: grub-keystatus.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/F-10/grub-keystatus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-keystatus.patch	25 Jun 2008 23:42:41 -0000	1.1
+++ grub-keystatus.patch	18 Nov 2008 20:25:35 -0000	1.2
@@ -586,3 +586,42 @@
  int console_getxy (void);
  void console_gotoxy (int x, int y);
  void console_cls (void);
+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);
+ 	    }
+ 	}
+     }


Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/F-10/grub.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- grub.spec	18 Nov 2008 19:46:27 -0000	1.78
+++ grub.spec	18 Nov 2008 20:25:35 -0000	1.79
@@ -1,6 +1,6 @@
 Name: grub
 Version: 0.97
-Release: 37%{?dist}
+Release: 38%{?dist}
 Summary: GRUB - the Grand Unified Boot Loader.
 Group: System Environment/Base
 License: GPLv2+
@@ -91,6 +91,9 @@
 %{_datadir}/grub
 
 %changelog
+* Tue Nov 18 2008 Peter Jones <pjones at redhat.com> - 0.97-38
+- Put back the accidentally removed fix for rhbz#458576 .
+
 * Tue Nov 18 2008 Peter Jones <pjones at redhat.com> - 0.97-37
 - Remove chainloader timeout patch; fixing it in booty instead in order to
   address rhbz#468526 .