2008-11-10 Robert Millan <rmh@aybabtu.com>

        * util/grub.d/00_header.in: Add backward compatibility check for
        versions of terminal.mod that don't understand `terminal_input' or
        `terminal_output'.

diff --git a/ChangeLog b/ChangeLog
index b8e0b1810cb74ad610da898bf2bbc87d9aa505d4..ba2b0e6c6c340696291bb02be7838b6780766b16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-10  Robert Millan  <rmh@aybabtu.com>
+
+       * util/grub.d/00_header.in: Add backward compatibility check for
+       versions of terminal.mod that don't understand `terminal_input' or
+       `terminal_output'.
+
 2008-11-09  Robert Millan  <rmh@aybabtu.com>
 
        * commands/terminal.c (GRUB_MOD_FINI(terminal)): Unregister

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 8967fd68d830f31894f3892d996326573385d929..fe17b6769715bbf0bc4c35345d20fca13ab6902d 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -59,7 +59,13 @@ case x${GRUB_TERMINAL_INPUT} in
     # Just use the native terminal
   ;;
   x*)
-    echo "terminal_input ${GRUB_TERMINAL_INPUT}"
+    cat << EOF
+if terminal_input ${GRUB_TERMINAL_INPUT} ; then true ; else
+  # For backward compatibility with versions of terminal.mod that don't
+  # understand terminal_input
+  terminal ${GRUB_TERMINAL_INPUT}
+fi
+EOF
   ;;
 esac
 
@@ -85,7 +91,11 @@ if font `make_system_path_relative_to_its_root ${GRUB_FONT_PATH}` ; then
   set gfxmode=${GRUB_GFXMODE}
   insmod gfxterm
   insmod ${video_backend}
-  terminal_output gfxterm
+  if terminal_output gfxterm ; then true ; else
+    # For backward compatibility with versions of terminal.mod that don't
+    # understand terminal_output
+    terminal gfxterm
+  fi
 fi
 EOF
   ;;
@@ -93,6 +103,12 @@ EOF
     # Just use the native terminal
   ;;
   x*)
-    echo "terminal_output ${GRUB_TERMINAL_OUTPUT}"
+    cat << EOF
+if terminal_output ${GRUB_TERMINAL_OUTPUT} ; then true ; else
+  # For backward compatibility with versions of terminal.mod that don't
+  # understand terminal_output
+  terminal ${GRUB_TERMINAL_OUTPUT}
+fi
+EOF
   ;;
 esac