From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 21 Jul 2010 04:44:38 +0000 (+0200)
Subject: 	* util/grub.d/00_header.in: Remove compatibility with terminal.mod
X-Git-Tag: 1.99~709
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ac33bf5eb13bd185c903ac29a3ec36f0502c74f;p=thirdparty%2Fgrub.git

	* util/grub.d/00_header.in: Remove compatibility with terminal.mod
	prior to terminal_input/terminal_output separation. It's been over 1.5
	years and those versions weren't widely deployed.
---

diff --git a/ChangeLog b/ChangeLog
index e0c2096bb..de1edebb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,12 @@
 	(grub_efi_console_fini): New function.
 	(grub_console_term_output): Register init and fini methods.
 
+2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub.d/00_header.in: Remove compatibility with terminal.mod
+	prior to terminal_input/terminal_output separation. It's been over 1.5
+	years and those versions weren't widely deployed.
+
 2010-07-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* tests/util/grub-shell-tester.in: Remove bashism and declare as
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 75c8b0fa2..2f39650e9 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -137,11 +137,7 @@ case x${GRUB_TERMINAL_INPUT} in
   ;;
   x*)
     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
+terminal_input ${GRUB_TERMINAL_INPUT}
 EOF
   ;;
 esac
@@ -152,11 +148,7 @@ case x${GRUB_TERMINAL_OUTPUT} in
   ;;
   x*)
     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
+terminal_output ${GRUB_TERMINAL_OUTPUT}
 EOF
   ;;
 esac