[2507] 2009-08-18 Felix Zielcke <[email protected]>

Pavel Roskin <[email protected]> Tue, 18 Aug 2009 17:57:07 +0000
Newsgroups gmane.comp.boot-loaders.grub.cvs
Message-ID <[email protected]>
Revision: 2507
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2507
Author:   proski
Date:     2009-08-18 17:57:07 +0000 (Tue, 18 Aug 2009)
Log Message:
-----------
2009-08-18  Felix Zielcke  <[email protected]>

	* util/grub-mkconfig.in: Don't use gfxterm by default if not
	explicitly specified by the user.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/grub-mkconfig.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-08-18 17:26:35 UTC (rev 2506)
+++ trunk/grub2/ChangeLog	2009-08-18 17:57:07 UTC (rev 2507)
@@ -1,3 +1,8 @@
+2009-08-18  Felix Zielcke  <[email protected]>
+
+	* util/grub-mkconfig.in: Don't use gfxterm by default if not
+	explicitly specified by the user.
+
 2009-08-18  Pavel Roskin  <[email protected]>
 
 	* include/grub/fbfill.h (struct grub_video_fbrender_target): Use

Modified: trunk/grub2/util/grub-mkconfig.in
===================================================================
--- trunk/grub2/util/grub-mkconfig.in	2009-08-18 17:26:35 UTC (rev 2506)
+++ trunk/grub2/util/grub-mkconfig.in	2009-08-18 17:57:07 UTC (rev 2507)
@@ -141,13 +141,7 @@
 fi
 
 case x${GRUB_TERMINAL_OUTPUT} in
-  x)
-    # If this platform supports gfxterm, try to use it.
-    if test -e ${grub_prefix}/gfxterm.mod ; then
-      GRUB_TERMINAL_OUTPUT=gfxterm
-    fi
-  ;;
-  xconsole | xserial | xofconsole | xgfxterm) ;;
+  x | xconsole | xserial | xofconsole | xgfxterm) ;;
   *) echo "Invalid output terminal \"${GRUB_TERMINAL_OUTPUT}\"" >&2 ; exit 1 ;;
 esac