Index: kern/term.c
===================================================================
RCS file: /cvsroot/grub/grub2/kern/term.c,v
retrieving revision 1.9
diff -u -p -r1.9 term.c
--- kern/term.c	20 Aug 2005 05:26:51 -0000	1.9
+++ kern/term.c	12 Oct 2005 17:34:00 -0000
@@ -21,6 +21,7 @@
 #include <grub/err.h>
 #include <grub/mm.h>
 #include <grub/misc.h>
+#include <grub/env.h>
 
 /* The list of terminals.  */
 static grub_term_t grub_term_list;
@@ -203,6 +204,9 @@ grub_gotoxy (grub_uint8_t x, grub_uint8_
 void
 grub_cls (void)
 {
+  if (grub_env_get ("debug"))
+    return;
+
   if (grub_cur_term->flags & GRUB_TERM_DUMB)
     {
       grub_putchar ('\n');
Index: kern/sparc64/ieee1275/init.c
===================================================================
RCS file: /cvsroot/grub/grub2/kern/sparc64/ieee1275/init.c,v
retrieving revision 1.1
diff -u -p -r1.1 init.c
--- kern/sparc64/ieee1275/init.c	21 Aug 2005 18:42:55 -0000	1.1
+++ kern/sparc64/ieee1275/init.c	12 Oct 2005 17:34:00 -0000
@@ -163,10 +163,6 @@ grub_machine_init (void)
 		   grub_heap_len);
   grub_mm_init_region ((void *) grub_heap_start, grub_heap_len);
 
-  grub_set_prefix ();
-
-  grub_ofdisk_init ();
-
   /* Process commandline.  */
   if (grub_ieee1275_get_property_length (grub_ieee1275_chosen, "bootargs",
                                          &length) == 0 &&
@@ -205,11 +201,18 @@ grub_machine_init (void)
 	}
     }
 
+  grub_set_prefix ();
+
+  grub_ofdisk_init ();
+
 }
 
 void