From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 28 Dec 2012 07:21:17 +0000 (+0000)
Subject: * util/grub-mkconfig.in: Accept GRUB_TERMINAL_OUTPUT=vga_text.
X-Git-Tag: grub-2.02-beta1~1390
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=608b647ad9c3ec4c4803beaf8d43bfb7c855fe28;p=thirdparty%2Fgrub.git

* util/grub-mkconfig.in: Accept GRUB_TERMINAL_OUTPUT=vga_text.
Fixes Savannah bug #37821.
---

diff --git a/ChangeLog b/ChangeLog
index b8bd21566..3bca6fddd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-28  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mkconfig.in: Accept GRUB_TERMINAL_OUTPUT=vga_text.
+	Fixes Savannah bug #37821.
+
 2012-12-28  Colin Watson  <cjwatson@ubuntu.com>
 
 	Apply program name transformations at build-time rather than at
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 426336766..8decc1d84 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -158,7 +158,7 @@ fi
 for x in ${GRUB_TERMINAL_OUTPUT}; do
     case "x${x}" in
 	xgfxterm) ;;
-	xconsole | xserial | xofconsole)
+	xconsole | xserial | xofconsole | xvga_text)
             # make sure all our children behave in conformance with ascii..
 	    export LANG=C;;
 	*) echo "Invalid output terminal \"${GRUB_TERMINAL_OUTPUT}\"" >&2 ; exit 1 ;;