SOURCES: grub-pxe.patch - fixed default config back to /boot/grub/menu.lst

[baggins]

Author: baggins                      Date: Tue Jan 13 10:15:24 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixed default config back to /boot/grub/menu.lst

---- Files affected:
SOURCES:
   grub-pxe.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/grub-pxe.patch
diff -u SOURCES/grub-pxe.patch:1.2 SOURCES/grub-pxe.patch:1.3
--- SOURCES/grub-pxe.patch:1.2	Mon Jan 12 15:00:12 2009
+++ SOURCES/grub-pxe.patch	Tue Jan 13 11:15:18 2009
@@ -3249,15 +3249,6 @@
 ===================================================================
 --- stage2/asm.S	(.../upstream/grub-0.97)	(revision 112)
 +++ stage2/asm.S	(.../trunk)	(revision 112)
-@@ -98,7 +98,7 @@
- 	.string VERSION
- VARIABLE(config_file)
- #ifndef STAGE1_5
--	.string "/boot/grub/menu.lst"
-+	.string "(nd)/tftp/menu.lst"
- #else   /* STAGE1_5 */
- 	.long	0xffffffff
- 	.string "/boot/grub/stage2"
 @@ -205,6 +205,55 @@
  	jmp EXT_C(hard_stop)
  
@@ -3651,32 +3642,6 @@
  
  int check_password(char *entered, char* expected, password_t type);
  #endif
-Index: stage2/fsys_ffs.c
-===================================================================
---- stage2/fsys_ffs.c	(.../upstream/grub-0.97)	(revision 112)
-+++ stage2/fsys_ffs.c	(.../trunk)	(revision 112)
-@@ -50,7 +50,7 @@
-  * the rights to redistribute these changes.
-  *
-  *	from: Mach, Revision 2.2  92/04/04  11:35:49  rpd
-- *	$Id$
-+ *	$Id$
-  */
- 
- #ifdef FSYS_FFS
-Index: stage2/tparm.c
-===================================================================
---- stage2/tparm.c	(.../upstream/grub-0.97)	(revision 112)
-+++ stage2/tparm.c	(.../trunk)	(revision 112)
-@@ -63,7 +63,7 @@
- #define MAX_FORMAT_LEN 256
- #define max(a,b) ((a) > (b) ? (a) : (b))
- 
--//MODULE_ID("$Id$")
-+//MODULE_ID("$Id$")
- 
- /*
-  *	char *
 Index: stage2/common.c
 ===================================================================
 --- stage2/common.c	(.../upstream/grub-0.97)	(revision 112)
@@ -3948,8 +3913,8 @@
 - *                  network device driver which uses this chip
 - *
 - * $Log$
-- * Revision 1.2  2009/01/12 14:00:12  baggins
-- * - dang, don't play with version number/name
+- * Revision 1.3  2009/01/13 10:15:18  baggins
+- * - fixed default config back to /boot/grub/menu.lst
 - *
 - * Revision 1.3  2000/07/29 19:22:54  okuji
 - * update the network support to etherboot-4.6.4.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/grub-pxe.patch?r1=1.2&r2=1.3&f=u