From: hollisb <hollisb@localhost>
Date: Fri, 4 Nov 2005 03:00:59 +0000 (+0000)
Subject: 2005-11-03  Hollis Blanchard  <hollis@penguinppc.org>
X-Git-Tag: 1.98~2045
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ce32619344201c9525de3010cf8f01c2f80991e;p=thirdparty%2Fgrub.git

2005-11-03  Hollis Blanchard  <hollis@penguinppc.org>

	* kern/term.c (grub_cls): Do not call grub_cur_term->cls() if the
	`debug' environment variable has been set.
---

diff --git a/ChangeLog b/ChangeLog
index 26848f591..e6f78a3d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2005-11-03  Hollis Blanchard  <hollis@penguinppc.org>
+
+	* kern/term.c (grub_cls): Do not call grub_cur_term->cls() if the
+	`debug' environment variable has been set.
+
+2005-11-02  Hollis Blanchard  <hollis@penguinppc.org>
+	
+	* Makefile.in (install-local): Use $(DATA).
+	(uninstall): Likewise.
+	* conf/powerpc-ieee1275.rmk (bin_UTILITIES): Move grub-mkimage...
+	(sbin_UTILITIES): ... to here.
+	(sbin_SCRIPTS): New variable.
+	(grub_install_SOURCES): New variable.
+	* util/powerpc/ieee1275/grub-install.in: New file.
+	* util/powerpc/ieee1275/grub-mkimage.c (kernel_path): Remove
+	variable.
+	(add_segments): Call `grub_util_get_path'.
+
 2005-10-28  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	From Timothy Baldwin:
diff --git a/kern/term.c b/kern/term.c
index cc4dd98d4..747b566bc 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -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;
@@ -207,7 +208,7 @@ grub_gotoxy (grub_uint8_t x, grub_uint8_t y)
 void
 grub_cls (void)
 {
-  if (grub_cur_term->flags & GRUB_TERM_DUMB)
+  if ((grub_cur_term->flags & GRUB_TERM_DUMB) || (grub_env_get ("debug")))
     {
       grub_putchar ('\n');
       grub_refresh ();