From 66f89845c04cc5cc358c6bb2cd9c4ac512136698 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Fri, 28 Dec 2012 07:21:17 +0000 Subject: [PATCH 073/482] * util/grub-mkconfig.in: Accept GRUB_TERMINAL_OUTPUT=vga_text. Fixes Savannah bug #37821. --- ChangeLog | 5 +++++ util/grub-mkconfig.in | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b8bd215..3bca6fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2012-12-28 Colin Watson + * util/grub-mkconfig.in: Accept GRUB_TERMINAL_OUTPUT=vga_text. + Fixes Savannah bug #37821. + +2012-12-28 Colin Watson + Apply program name transformations at build-time rather than at run-time. Fixes Debian bug #696465. diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in index 4263367..8decc1d 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 ;; -- 1.8.2.1