Attachment 155232 Details for Bug 239760 – Silence grub completely

[patch] Silence grub completely

grub-0.94-silence.patch (text/plain), 3.59 KB, created by Pádraig Brady on 2007-05-23 12:32:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pádraig Brady

Created: 2007-05-23 12:32:55 UTC

Size: 3.59 KB

patch

obsolete

>diff -Naur -Naru grub-0.94/stage1/stage1.S grub-0.94-pb/stage1/stage1.S
>--- grub-0.94/stage1/stage1.S	2003-07-09 11:45:51.000000000 +0000
>+++ grub-0.94-pb/stage1/stage1.S	2005-12-05 10:57:16.000000000 +0000
>@@ -30,7 +30,8 @@
> #define ABS(x) (x-_start+0x7c00)
> 
> 	/* Print message string */
>-#define MSG(x)	movw $ABS(x), %si; call message
>+#define MSG(x)
>+#define MSGERR(x)	movw $ABS(x), %si; call message
> 
> 	/* XXX:	binutils-2.9.1.0.x doesn't produce a short opcode for this. */
> #define	MOV_MEM_TO_AL(x)	.byte 0xa0;  .word x
>@@ -373,24 +374,24 @@
>  * BIOS Geometry translation error (past the end of the disk geometry!).
>  */
> geometry_error:
>-	MSG(geometry_error_string)
>+	MSGERR(geometry_error_string)
> 	jmp	general_error
> 
> /*
>  * Disk probe failure.
>  */
> hd_probe_error:
>-	MSG(hd_probe_error_string)
>+	MSGERR(hd_probe_error_string)
> 	jmp	general_error
> 
> /*
>  * Read error on the disk.
>  */
> read_error:
>-	MSG(read_error_string)
>+	MSGERR(read_error_string)
> 
> general_error:
>-	MSG(general_error_string)
>+	MSGERR(general_error_string)
> 
> /* go here when you need to stop the machine hard after an error condition */
> stop:	jmp	stop
>@@ -466,7 +467,7 @@
> /*
>  * Floppy disk probe failure.
>  */
>-	MSG(fd_probe_error_string)
>+	MSGERR(fd_probe_error_string)
> 	jmp	general_error
> 
> fd_probe_error_string:	.string "Floppy"
>diff -Naur -Naru grub-0.94/stage2/char_io.c grub-0.94-pb/stage2/char_io.c
>--- grub-0.94/stage2/char_io.c	2005-12-05 10:52:56.000000000 +0000
>+++ grub-0.94-pb/stage2/char_io.c	2005-12-05 10:57:16.000000000 +0000
>@@ -120,9 +120,9 @@
>   if (errnum > ERR_NONE && errnum < MAX_ERR_NUM)
> #ifndef STAGE1_5
>     /* printf("\7\n %s\n", err_list[errnum]); */
>-    printf ("\nError %u: %s\n", errnum, err_list[errnum]);
>+    grub_printf_error ("\nError %u: %s\n", errnum, err_list[errnum]);
> #else /* STAGE1_5 */
>-    printf ("Error %u\n", errnum);
>+    grub_printf_error ("Error %u\n", errnum);
> #endif /* STAGE1_5 */
> }
> 
>@@ -176,7 +176,7 @@
> }
> 
> void
>-grub_printf (const char *format,...)
>+grub_printf_error (const char *format,...)
> {
>   int *dataptr = (int *) &format;
>   char c, str[16];
>diff -Naur -Naru grub-0.94/stage2/shared.h grub-0.94-pb/stage2/shared.h
>--- grub-0.94/stage2/shared.h	2005-12-05 10:52:56.000000000 +0000
>+++ grub-0.94-pb/stage2/shared.h	2005-12-05 10:57:16.000000000 +0000
>@@ -364,6 +364,9 @@
> #define strcpy grub_strcpy
> #endif /* WITHOUT_LIBC_STUBS */
> 
>+#undef printf
>+#define printf(x, ...)
>+#define grub_printf(x, ...)
> 
> #ifndef ASM_FILE
> /*
>@@ -858,7 +861,7 @@
> #endif
> 
> /* C library replacement functions with identical semantics. */
>-void grub_printf (const char *format,...);
>+void grub_printf_error (const char *format,...);
> int grub_sprintf (char *buffer, const char *format, ...);
> int grub_tolower (int c);
> int grub_isspace (int c);
>diff -Naur -Naru grub-0.94/stage2/start.S grub-0.94-pb/stage2/start.S
>--- grub-0.94/stage2/start.S	2003-07-09 11:45:53.000000000 +0000
>+++ grub-0.94-pb/stage2/start.S	2005-12-05 10:57:16.000000000 +0000
>@@ -38,7 +38,8 @@
> #endif /* STAGE1_5 */
> 	
> 	/* Print message string */
>-#define MSG(x)	movw $ABS(x), %si; call message
>+#define MSG(x)
>+#define MSGERR(x)	movw $ABS(x), %si; call message
> 
> 	.file	"start.S"
> 
>@@ -323,17 +324,17 @@
>  * BIOS Geometry translation error (past the end of the disk geometry!).
>  */
> geometry_error:
>-	MSG(geometry_error_string)
>+	MSGERR(geometry_error_string)
> 	jmp	general_error
> 
> /*
>  * Read error on the disk.
>  */
> read_error:
>-	MSG(read_error_string)
>+	MSGERR(read_error_string)
> 
> general_error:
>-	MSG(general_error_string)
>+	MSGERR(general_error_string)
> 
> /* go here when you need to stop the machine hard after an error condition */
> stop:	jmp	stop

Actions: View | Diff

Attachments on bug 239760: 154515 | 155232