* util/grub-mkconfig.in: Accept GRUB_TERMINAL_OUTPUT=vga_text.

Fixes Savannah bug #37821.

diff --git a/ChangeLog b/ChangeLog
index b8bd215662fabba6e36f51003655c3c09783ec61..3bca6fddd9e436d2ef71c27c46f4a3f811cf3614 100644 (file)
--- 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 4263367668daff6ec116badc0493b3afa4f9643a..8decc1d84cd251419d7bc2aace42b0cab9d4783e 100644 (file)
--- 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 ;;