From 10523df4781740c499113bed7f1827f627f82cbf Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sat, 23 Jan 2010 11:19:26 +0530
Subject: [PATCH 01/11] while and until loops support

---
 include/grub/script_sh.h | 22 ++++++++++++++++++++++
 script/execute.c         | 20 ++++++++++++++++++++
 script/parser.y          | 35 ++++++++++++++++++++++++++++++-----
 script/script.c          | 22 ++++++++++++++++++++++
 util/grub-script-check.c |  6 ++++++
 5 files changed, 100 insertions(+), 5 deletions(-)

diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
index 4436afbf1..207b5fcbc 100644
--- a/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@ -121,6 +121,21 @@ struct grub_script_cmdfor
   struct grub_script_cmd *list;
 };
 
+/* A while/until command.  */
+struct grub_script_cmdwhile
+{
+  struct grub_script_cmd cmd;
+
+  /* The command list used as condition.  */
+  struct grub_script_cmd *cond;
+
+  /* The command list executed in each loop.  */
+  struct grub_script_cmd *list;
+
+  /* The flag to indicate this as "until" loop.  */
+  int until;
+};
+
 /* A menu entry generate statement.  */
 struct grub_script_cmd_menuentry
 {
@@ -234,6 +249,12 @@ grub_script_create_cmdfor (struct grub_parser_param *state,
 			   struct grub_script_arglist *words,
 			   struct grub_script_cmd *list);
 
+struct grub_script_cmd *
+grub_script_create_cmdwhile (struct grub_parser_param *state,
+			     struct grub_script_cmd *cond,
+			     struct grub_script_cmd *list,
+			     int is_an_until_loop);
+
 struct grub_script_cmd *
 grub_script_create_cmdmenu (struct grub_parser_param *state,
 			    struct grub_script_arglist *arglist,
@@ -283,6 +304,7 @@ grub_err_t grub_script_execute_cmdline (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdblock (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdif (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_cmdfor (struct grub_script_cmd *cmd);
+grub_err_t grub_script_execute_cmdwhile (struct grub_script_cmd *cmd);
 grub_err_t grub_script_execute_menuentry (struct grub_script_cmd *cmd);
 
 /* Execute any GRUB pre-parsed command or script.  */
diff --git a/script/execute.c b/script/execute.c
index aa6975fdd..b905de46f 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -308,6 +308,26 @@ grub_script_execute_cmdfor (struct grub_script_cmd *cmd)
   return result;
 }
 
+/* Execute a "while" or "until" command.  */
+grub_err_t
+grub_script_execute_cmdwhile (struct grub_script_cmd *cmd)
+{
+  int cond;
+  int result;
+  struct grub_script_cmdwhile *cmdwhile = (struct grub_script_cmdwhile *) cmd;
+
+  result = 0;
+  do {
+    cond = grub_script_execute_cmd (cmdwhile->cond);
+    if ((cmdwhile->until && !cond) || (!cmdwhile->until && cond))
+      break;
+
+    result = grub_script_execute_cmd (cmdwhile->list);
+  } while (1); /* XXX Put a check for ^C here */
+
+  return result;
+}
+
 /* Execute the menu entry generate statement.  */
 grub_err_t
 grub_script_execute_menuentry (struct grub_script_cmd *cmd)
diff --git a/script/parser.y b/script/parser.y
index 26a6e3735..4d22ae400 100644
--- a/script/parser.y
+++ b/script/parser.y
@@ -76,8 +76,9 @@
 %token <arg> GRUB_PARSER_TOKEN_WORD      "word"
 
 %type <arglist> word argument arguments0 arguments1
-%type <cmd> script_init script grubcmd ifcmd forcmd command
-%type <cmd> commands1 menuentry statement
+%type <cmd> script_init script
+%type <cmd> grubcmd ifcmd forcmd whilecmd untilcmd
+%type <cmd> command commands1 menuentry statement
 
 %pure-parser
 %lex-param   { struct grub_parser_param *state };
@@ -173,9 +174,11 @@ grubcmd: word arguments0
 ;
 
 /* A single command.  */
-command: grubcmd { $$ = $1; }
-       | ifcmd   { $$ = $1; }
-       | forcmd  { $$ = $1; }
+command: grubcmd  { $$ = $1; }
+       | ifcmd    { $$ = $1; }
+       | forcmd   { $$ = $1; }
+       | whilecmd { $$ = $1; }
+       | untilcmd { $$ = $1; }
 ;
 
 /* A list of commands. */
@@ -250,3 +253,25 @@ forcmd: "for" "name"
 	  grub_script_lexer_deref (state->lexerstate);
 	}
 ;
+
+whilecmd: "while"
+          {
+	    grub_script_lexer_ref (state->lexerstate);
+          }
+          commands1 delimiters1 "do" commands1 delimiters1 "done"
+	  {
+	    $$ = grub_script_create_cmdwhile (state, $3, $6, 0);
+	    grub_script_lexer_deref (state->lexerstate);
+	  }
+;
+
+untilcmd: "until"
+          {
+	    grub_script_lexer_ref (state->lexerstate);
+          }
+          commands1 delimiters1 "do" commands1 delimiters1 "done"
+	  {
+	    $$ = grub_script_create_cmdwhile (state, $3, $6, 1);
+	    grub_script_lexer_deref (state->lexerstate);
+	  }
+;
diff --git a/script/script.c b/script/script.c
index 9142a8245..4c87d9491 100644
--- a/script/script.c
+++ b/script/script.c
@@ -245,6 +245,28 @@ grub_script_create_cmdfor (struct grub_parser_param *state,
   return (struct grub_script_cmd *) cmd;
 }
 
+/* Create a "while" or "until" command.  */
+struct grub_script_cmd *
+grub_script_create_cmdwhile (struct grub_parser_param *state,
+			     struct grub_script_cmd *cond,
+			     struct grub_script_cmd *list,
+			     int is_an_until_loop)
+{
+  struct grub_script_cmdwhile *cmd;
+
+  cmd = grub_script_malloc (state, sizeof (*cmd));
+  if (! cmd)
+    return 0;
+
+  cmd->cmd.exec = grub_script_execute_cmdwhile;
+  cmd->cmd.next = 0;
+  cmd->cond = cond;
+  cmd->list = list;
+  cmd->until = is_an_until_loop;
+
+  return (struct grub_script_cmd *) cmd;
+}
+
 /* Create a command that adds a menu entry to the menu.  Title is an
    argument that is parsed to generate a string that can be used as
    the title.  The sourcecode for this entry is passed in SOURCECODE.
diff --git a/util/grub-script-check.c b/util/grub-script-check.c
index 3b3f5bd47..eb11988e3 100644
--- a/util/grub-script-check.c
+++ b/util/grub-script-check.c
@@ -87,6 +87,12 @@ grub_script_execute_cmdfor (struct grub_script_cmd *cmd __attribute__ ((unused))
   return 0;
 }
 
+grub_err_t
+grub_script_execute_cmdwhile (struct grub_script_cmd *cmd __attribute__ ((unused)))
+{
+  return 0;
+}
+
 grub_err_t
 grub_script_execute_menuentry (struct grub_script_cmd *cmd __attribute__ ((unused)))
 {

From c1273662b92bb745d7b1dbdcc247fea7b918e25e Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 26 Jan 2010 09:39:51 +0530
Subject: [PATCH 02/11] added change log file

---
 ChangeLog.while-until-loops | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 ChangeLog.while-until-loops

diff --git a/ChangeLog.while-until-loops b/ChangeLog.while-until-loops
new file mode 100644
index 000000000..33a3a839d
--- /dev/null
+++ b/ChangeLog.while-until-loops
@@ -0,0 +1,15 @@
+2010-01-26  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	While and until loops support to GRUB script.
+
+	* include/grub/script_sh.h (grub_script_cmdwhile): New struct.
+	(grub_script_create_cmdwhile): New function prototype.
+	(grub_script_execute_cmdwhile): New function prototype.
+	* script/execute.c (grub_script_execute_cmdwhile): New function.
+	* script/parser.y (command): New commands.
+	(whilecmd): New grammar rule.
+	(untilcmd): New grammar rule.
+	* script/script.c (grub_script_create_cmdwhile): New function.
+	* util/grub-script-check.c (grub_script_execute_cmdwhile): New
+	function.
+

From 3342306cec42aed344501adaeb13571a3dc4c1ae Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 26 Jan 2010 12:32:24 +0530
Subject: [PATCH 03/11] several fixes in return value handling

---
 ChangeLog.while-until-loops |  5 +++++
 commands/test.c             |  3 +--
 commands/true.c             |  2 +-
 conf/tests.rmk              |  4 ++++
 script/execute.c            | 28 ++++++++++++++++------------
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/ChangeLog.while-until-loops b/ChangeLog.while-until-loops
index 33a3a839d..ac54b8cd9 100644
--- a/ChangeLog.while-until-loops
+++ b/ChangeLog.while-until-loops
@@ -13,3 +13,8 @@
 	* util/grub-script-check.c (grub_script_execute_cmdwhile): New
 	function.
 
+	* tests/grub_script_while1.in: New testcase.
+	* conf/tests.rmk: New testcase make rule.
+
+	* commands/true.c (grub_cmd_false): Remove printing error message.
+	* commands/test.c (grub_cmd_test): Likewise.
diff --git a/commands/test.c b/commands/test.c
index 6995165cf..64ad69522 100644
--- a/commands/test.c
+++ b/commands/test.c
@@ -412,8 +412,7 @@ grub_cmd_test (grub_command_t cmd __attribute__ ((unused)),
   if (argc >= 1 && grub_strcmp (args[argc - 1], "]") == 0)
     argc--;
 
-  return test_parse (args, &argn, argc) ? GRUB_ERR_NONE
-    : grub_error (GRUB_ERR_TEST_FAILURE, "false");
+  return test_parse (args, &argn, argc) ? 0 : 1;
 }
 
 static grub_command_t cmd_1, cmd_2;
diff --git a/commands/true.c b/commands/true.c
index aa8125853..20403c588 100644
--- a/commands/true.c
+++ b/commands/true.c
@@ -34,7 +34,7 @@ grub_cmd_false (struct grub_command *cmd __attribute__ ((unused)),
 		int argc __attribute__ ((unused)),
 		char *argv[] __attribute__ ((unused)))
 {
-  return grub_error (GRUB_ERR_TEST_FAILURE, "false");
+  return 1;
 }
 
 static grub_command_t cmd_true, cmd_false;
diff --git a/conf/tests.rmk b/conf/tests.rmk
index 92f14797d..442beb0d3 100644
--- a/conf/tests.rmk
+++ b/conf/tests.rmk
@@ -53,6 +53,9 @@ grub_script_vars1_SOURCES = tests/grub_script_vars1.in
 check_SCRIPTS += grub_script_for1
 grub_script_for1_SOURCES = tests/grub_script_for1.in
 
+check_SCRIPTS += grub_script_while1
+grub_script_while1_SOURCES = tests/grub_script_while1.in
+
 # List of tests to execute on "make check"
 # SCRIPTED_TESTS    = example_scripted_test
 # SCRIPTED_TESTS   += example_grub_script_test
@@ -63,6 +66,7 @@ SCRIPTED_TESTS  = grub_script_echo1
 SCRIPTED_TESTS += grub_script_echo_keywords
 SCRIPTED_TESTS += grub_script_vars1
 SCRIPTED_TESTS += grub_script_for1
+SCRIPTED_TESTS += grub_script_while1
 
 # dependencies between tests and testing-tools
 $(SCRIPTED_TESTS): grub-shell grub-shell-tester
diff --git a/script/execute.c b/script/execute.c
index b905de46f..37686627d 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -26,13 +26,24 @@
 #include <grub/lib/arg.h>
 #include <grub/normal.h>
 
+/* Max digits for a char is 3 (0xFF is 255), similarly for an int it
+   is sizeof (int) * 3, and one extra for a possible -ve sign.  */
+#define ERRNO_DIGITS_MAX  (sizeof (int) * 3 + 1)
+
 static grub_err_t
 grub_script_execute_cmd (struct grub_script_cmd *cmd)
 {
+  int ret;
+  char errnobuf[ERRNO_DIGITS_MAX + 1];
+
   if (cmd == 0)
     return 0;
 
-  return cmd->exec (cmd);
+  ret = cmd->exec (cmd);
+
+  grub_snprintf (errnobuf, sizeof (errnobuf), "%d", ret);
+  grub_env_set ("?", errnobuf);
+  return ret;
 }
 
 /* Expand arguments in ARGLIST into multiple arguments.  */
@@ -188,7 +199,6 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
   grub_err_t ret = 0;
   int argcount = 0;
   grub_script_function_t func = 0;
-  char errnobuf[18];
   char *cmdname;
 
   /* Lookup the command.  */
@@ -222,11 +232,7 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 	      grub_env_set (assign, eq);
 	    }
 	  grub_free (assign);
-
-	  grub_snprintf (errnobuf, sizeof (errnobuf), "%d", grub_errno);
-	  grub_env_set ("?", errnobuf);
-
-	  return 0;
+	  return grub_errno;
 	}
     }
 
@@ -241,9 +247,6 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
     grub_free (args[i]);
   grub_free (args);
 
-  grub_snprintf (errnobuf, sizeof (errnobuf), "%d", ret);
-  grub_env_set ("?", errnobuf);
-
   return ret;
 }
 
@@ -251,13 +254,14 @@ grub_script_execute_cmdline (struct grub_script_cmd *cmd)
 grub_err_t
 grub_script_execute_cmdblock (struct grub_script_cmd *cmd)
 {
+  int ret = 0;
   struct grub_script_cmdblock *cmdblock = (struct grub_script_cmdblock *) cmd;
 
   /* Loop over every command and execute it.  */
   for (cmd = cmdblock->cmdlist; cmd; cmd = cmd->next)
-    grub_script_execute_cmd (cmd);
+    ret = grub_script_execute_cmd (cmd);
 
-  return 0;
+  return ret;
 }
 
 /* Execute an if statement.  */

From 2aa1646307cc44f4ae31d340d24f70fdc226b0fa Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 26 Jan 2010 12:32:47 +0530
Subject: [PATCH 04/11] new testcase for while and until loops

---
 tests/grub_script_while1.in | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 tests/grub_script_while1.in

diff --git a/tests/grub_script_while1.in b/tests/grub_script_while1.in
new file mode 100644
index 000000000..554247f76
--- /dev/null
+++ b/tests/grub_script_while1.in
@@ -0,0 +1,32 @@
+#! @builddir@/grub-shell-tester
+
+echo one
+foo=""
+while test "$foo" != "1111"; do foo="${foo}1"; echo "$foo"; done
+
+echo two
+foo=""
+while test "$foo" != "aaaa"
+do
+  foo="${foo}a"
+  echo $foo
+done
+
+foo=""
+until test "$foo" = "1111"; do foo="${foo}1"; echo $foo; done
+foo=""
+until test "$foo" = "aaaa"
+do
+  foo="${foo}a"
+  echo $foo
+done
+
+# check "$?" in condition gets its value from while body commands
+foo=""
+false
+while test "$?" != "0"
+do
+    echo $foo
+    foo="${foo}1"
+    test "$foo" = "111111"
+done

From b5c5144ab11c3b9168949abe2c52a069ba58e862 Mon Sep 17 00:00:00 2001
From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 26 Jan 2010 14:33:23 +0530
Subject: [PATCH 05/11] made while/until loop condition check more readable

---
 script/execute.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/execute.c b/script/execute.c
index 37686627d..cdfe47337 100644
--- a/script/execute.c
+++ b/script/execute.c
@@ -323,7 +323,7 @@ grub_script_execute_cmdwhile (struct grub_script_cmd *cmd)
   result = 0;
   do {
     cond = grub_script_execute_cmd (cmdwhile->cond);
-    if ((cmdwhile->until && !cond) || (!cmdwhile->until && cond))
+    if (cmdwhile->until ? !cond : cond)
       break;
 
     result = grub_script_execute_cmd (cmdwhile->list);

From d5631db0f2763746d35bd6ca895610b133f0841d Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Apr 2010 21:12:20 +0200
Subject: [PATCH 06/11] 	grub-mkconfig multiple terminal support.

	* util/grub-mkconfig.in: Handle multiple terminals correctly.
	* util/grub.d/00_header.in: Likewise.
---
 ChangeLog.mtcfg          |   6 ++
 util/grub-mkconfig.in    | 115 ++++++++++++++++++++++-----------------
 util/grub.d/00_header.in |  76 ++++++++++++++------------
 3 files changed, 110 insertions(+), 87 deletions(-)
 create mode 100644 ChangeLog.mtcfg

diff --git a/ChangeLog.mtcfg b/ChangeLog.mtcfg
new file mode 100644
index 000000000..2f246c26a
--- /dev/null
+++ b/ChangeLog.mtcfg
@@ -0,0 +1,6 @@
+2010-04-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	grub-mkconfig multiple terminal support.
+
+	* util/grub-mkconfig.in: Handle multiple terminals correctly.
+	* util/grub.d/00_header.in: Likewise.
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index daa110be7..94cd2e199 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -140,60 +140,73 @@ if [ "x${GRUB_TERMINAL}" != "x" ] ; then
   GRUB_TERMINAL_OUTPUT="${GRUB_TERMINAL}"
 fi
 
-case x${GRUB_TERMINAL_OUTPUT} in
-  x | xgfxterm)
-    # If this platform supports gfxterm, try to use it.
-    if test -e ${grub_prefix}/gfxterm.mod ; then
-      # FIXME: this should do something smarter than just loading first
-      # video backend.
-      GRUB_VIDEO_BACKEND=$(head -n 1 ${grub_prefix}/video.lst || true)
-      if [ -n "${GRUB_VIDEO_BACKEND}" ] ; then
-        GRUB_TERMINAL_OUTPUT=gfxterm
-      elif [ "${GRUB_TERMINAL_OUTPUT}" = "gfxterm" ] ; then
-        echo "No suitable backend could be found for gfxterm." >&2 ; exit 1
-      fi
-    fi
-  ;;
-  xconsole | xserial | xofconsole) ;;
-  *) echo "Invalid output terminal \"${GRUB_TERMINAL_OUTPUT}\"" >&2 ; exit 1 ;;
-esac
+termoutdefault=0
+if [ "x${GRUB_TERMINAL_OUTPUT}" == x ]; then
+    GRUB_TERMINAL_OUTPUT=gfxterm;
+    termoutdefault=1;
+fi
 
-# check for terminals that require fonts
-case ${GRUB_TERMINAL_OUTPUT} in
-  gfxterm)
-    if [ -n "$GRUB_FONT" ] ; then
-      if is_path_readable_by_grub ${GRUB_FONT} > /dev/null ; then
-        GRUB_FONT_PATH=${GRUB_FONT}
-	else
-	  echo "No such font or not readable by grub: ${GRUB_FONT}" >&2
-	  exit 1
+for x in ${GRUB_TERMINAL_OUTPUT}; do
+    if [ x${x} == xgfxterm ]; then
+        # If this platform supports gfxterm, try to use it.
+	if ! test -e ${grub_prefix}/gfxterm.mod ; then
+	    if [ "x$termoutdefault" != "x1" ]; then
+		echo "gfxterm isn't available on your platform" >&2 ; exit 1
+	    fi
+	    GRUB_TERMINAL_OUTPUT=
+	    break;
+	fi
+        # FIXME: this should do something smarter than just loading first
+        # video backend.
+	GRUB_VIDEO_BACKEND=$(head -n 1 ${grub_prefix}/video.lst || true)
+	if [ -z "${GRUB_VIDEO_BACKEND}" ] ; then
+	    if [ "x$termoutdefault" != "x1" ]; then
+		echo "No suitable backend could be found for gfxterm." >&2 ; exit 1
+	    fi
+	    GRUB_TERMINAL_OUTPUT=
+	fi
+	if [ -n "$GRUB_FONT" ] ; then
+	    if is_path_readable_by_grub ${GRUB_FONT} > /dev/null ; then
+		GRUB_FONT_PATH=${GRUB_FONT}
+	    else
+		echo "No such font or not readable by grub: ${GRUB_FONT}" >&2
+		exit 1
+	    fi
+	else
+	    for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do
+		for basename in unicode unifont ascii; do
+		    path="${dir}/${basename}.pf2"
+		    if is_path_readable_by_grub ${path} > /dev/null ; then
+			GRUB_FONT_PATH=${path}
+		    else
+			continue
+		    fi
+		    if [ "${basename}" = "ascii" ] ; then
+	                # make sure all our children behave in conformance with ascii..
+			export LANG=C
+		    fi
+		    break 2
+		done
+	    done
+	fi
+	if [ -z "${GRUB_FONT_PATH}" ] ; then
+	    if [ "x$termoutdefault" != "x1" ]; then
+		echo "No font for gfxterm found." >&2 ; exit 1
+	    fi
+	    GRUB_TERMINAL_OUTPUT=
 	fi
-    else
-      for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do
-        for basename in unicode unifont ascii; do
-	  path="${dir}/${basename}.pf2"
-          if is_path_readable_by_grub ${path} > /dev/null ; then
-	    GRUB_FONT_PATH=${path}
-	  else
-	    continue
-	  fi
-	  if [ "${basename}" = "ascii" ] ; then
-	    # make sure all our children behave in conformance with ascii..
-	    export LANG=C
-	  fi
-	  break 2
-        done
-      done
     fi
-    if [ -z "${GRUB_FONT_PATH}" ] ; then
-      # fallback to the native terminal for this platform
-      unset GRUB_TERMINAL_OUTPUT
-    fi
-  ;;
-  *)
-    # make sure all our children behave in conformance with ascii..
-    export LANG=C
-esac
+done
+
+for x in ${GRUB_TERMINAL_OUTPUT}; do
+    case "x${x}" in
+	xgfxterm) ;;
+	xconsole | xserial | xofconsole)
+            # make sure all our children behave in conformance with ascii..
+	    export LANG=C;;
+	*) echo "Invalid output terminal \"${GRUB_TERMINAL_OUTPUT}\"" >&2 ; exit 1 ;;
+    esac
+done
 
 # These are defined in this script, export them here so that user can
 # override them.
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index c86f7b867..81f7a213a 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -59,19 +59,52 @@ function savedefault {
 }
 EOF
 
-case ${GRUB_TERMINAL_INPUT}:${GRUB_TERMINAL_OUTPUT} in
-  serial:* | *:serial)
+serial=0;
+gfxterm=0;
+for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
+    if [ xserial = "x$x" ]; then
+	serial=1;
+    fi
+    if [ xgfxterm = "x$x" ]; then
+	gfxterm=1;
+    fi
+done
+
+if [ "x$serial" = x1 ]; then
     if ! test -e ${grub_prefix}/serial.mod ; then
-      echo "Serial terminal not available on this platform." >&2 ; exit 1
+	echo "Serial terminal not available on this platform." >&2 ; exit 1
     fi
 
     if [ "x${GRUB_SERIAL_COMMAND}" = "x" ] ; then
-      grub_warn "Requested serial terminal but GRUB_SERIAL_COMMAND is unspecified. Default parameters will be used."
-      GRUB_SERIAL_COMMAND=serial
+	grub_warn "Requested serial terminal but GRUB_SERIAL_COMMAND is unspecified. Default parameters will be used."
+	GRUB_SERIAL_COMMAND=serial
     fi
     echo "${GRUB_SERIAL_COMMAND}"
-  ;;
-esac
+fi
+
+if [ "x$gfxterm" = x1 ]; then
+    # Make the font accessible
+    prepare_grub_to_access_device `${grub_probe} --target=device ${GRUB_FONT_PATH}`
+
+    cat << EOF
+if loadfont `make_system_path_relative_to_its_root ${GRUB_FONT_PATH}` ; then
+  set gfxmode=${GRUB_GFXMODE}
+  insmod gfxterm
+  insmod ${GRUB_VIDEO_BACKEND}
+EOF
+    if [ x$GRUB_THEME != x ] && [ -f $GRUB_THEME ] \
+	&& is_path_readable_by_grub $GRUB_THEME; then
+	echo "Found theme: $GRUB_THEME" >&2
+	prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME` | sed -e "s/^/  /"
+	cat << EOF
+  insmod gfxmenu
+  set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
+EOF
+    fi
+    cat << EOF
+fi
+EOF
+fi
 
 case x${GRUB_TERMINAL_INPUT} in
   x)
@@ -89,35 +122,6 @@ EOF
 esac
 
 case x${GRUB_TERMINAL_OUTPUT} in
- xgfxterm)
-    # Make the font accessible
-    prepare_grub_to_access_device `${grub_probe} --target=device ${GRUB_FONT_PATH}`
-
-    cat << EOF
-if loadfont `make_system_path_relative_to_its_root ${GRUB_FONT_PATH}` ; then
-  set gfxmode=${GRUB_GFXMODE}
-  insmod gfxterm
-  insmod ${GRUB_VIDEO_BACKEND}
-  if terminal_output gfxterm ; then true ; else
-    # For backward compatibility with versions of terminal.mod that don't
-    # understand terminal_output
-    terminal gfxterm
-  fi
-EOF
-if [ x$GRUB_THEME != x ] && [ -f $GRUB_THEME ] \
-	&& is_path_readable_by_grub $GRUB_THEME; then
-    echo "Found theme: $GRUB_THEME" >&2
-    prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME` | sed -e "s/^/  /"
-    cat << EOF
-  insmod gfxmenu
-  set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
-  set menuviewer=gfxmenu
-EOF
-fi
-    cat << EOF
-fi
-EOF
-  ;;
   x)
     # Just use the native terminal
   ;;

From df60998c64afaf0025f59365c172109c6ecab774 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 8 Apr 2010 10:54:44 +0100
Subject: [PATCH 07/11] * util/grub.d/10_linux.in: Only use the first word of
 GRUB_DISTRIBUTOR for --class, to avoid problems if somebody puts spaces in
 GRUB_DISTRIBUTOR. * util/grub.d/10_kfreebsd.in: Likewise. *
 util/grub.d/10_hurd.in: Likewise.

---
 ChangeLog                  | 8 ++++++++
 util/grub.d/10_hurd.in     | 2 +-
 util/grub.d/10_kfreebsd.in | 2 +-
 util/grub.d/10_linux.in    | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7441af4b3..83825a6c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-08  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub.d/10_linux.in: Only use the first word of
+	GRUB_DISTRIBUTOR for --class, to avoid problems if somebody puts
+	spaces in GRUB_DISTRIBUTOR.
+	* util/grub.d/10_kfreebsd.in: Likewise.
+	* util/grub.d/10_hurd.in: Likewise.
+
 2010-04-06  BVK Chaitanya  <bvk.groups@gmail.com>
 
 	Fix unit testing framework for Qemu 0.12.
diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
index fbb4eb752..5dbb11f22 100644
--- a/util/grub.d/10_hurd.in
+++ b/util/grub.d/10_hurd.in
@@ -27,7 +27,7 @@ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU
 else
   OS="${GRUB_DISTRIBUTOR} GNU/Hurd"
-  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}"
+  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
 fi
 
 at_least_one=false
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
index dc87d6162..43651c82b 100644
--- a/util/grub.d/10_kfreebsd.in
+++ b/util/grub.d/10_kfreebsd.in
@@ -30,7 +30,7 @@ CLASS="--class os"
 case "${GRUB_DISTRIBUTOR}" in
   Debian)
 	OS="${GRUB_DISTRIBUTOR} GNU/kFreeBSD"
-	CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') --class gnu-kfreebsd --class gnu ${CLASS}"
+	CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) --class gnu-kfreebsd --class gnu ${CLASS}"
   ;;
   *)
 	OS="FreeBSD"
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 2c60bc681..8dc0df5d9 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -31,7 +31,7 @@ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU/Linux
 else
   OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}"
+  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
 fi
 
 # loop-AES arranges things so that /dev/loop/X can be our root device, but

From b7841cebaafade6c545b7bef66ae2a0a1c7be91f Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 9 Apr 2010 16:18:25 +0200
Subject: [PATCH 08/11] 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>

	* Makefile.in: Specify files explicitly instead of using $< and $@ since
	we use cd $(srcdir).
---
 ChangeLog   | 5 +++++
 Makefile.in | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83825a6c3..ee19f60d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* Makefile.in: Specify files explicitly instead of using $< and $@ since
+	we use cd $(srcdir).
+
 2010-04-08  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub.d/10_linux.in: Only use the first word of
diff --git a/Makefile.in b/Makefile.in
index ed460e4cf..d5eda4be3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -530,8 +530,8 @@ genkernsyms.sh: genkernsyms.sh.in config.status
 	$(SHELL) ./config.status
 
 $(srcdir)/po/$(PACKAGE).pot: po/POTFILES po/POTFILES-shell
-	cd $(srcdir) && $(XGETTEXT) -ctranslate --from-code=utf-8 -o $@ -f $< --keyword=_ --keyword=N_
-	cd $(srcdir) && $(XGETTEXT) -ctranslate --from-code=utf-8 -o $@ -f po/POTFILES-shell -j --language=Shell
+	cd $(srcdir) && $(XGETTEXT) -ctranslate --from-code=utf-8 -o po/$(PACKAGE).pot -f po/POTFILES --keyword=_ --keyword=N_
+	cd $(srcdir) && $(XGETTEXT) -ctranslate --from-code=utf-8 -o po/$(PACKAGE).pot -f po/POTFILES-shell -j --language=Shell
 
 $(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): po/$(PACKAGE).pot
 	$(MSGMERGE) -U $@ $^

From d64795c0eb35035727f5186535f4b81df0542d99 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 9 Apr 2010 16:56:07 +0200
Subject: [PATCH 09/11] 	Load fonts and modules for gfxmenu in grub-mkconfig. 
 Idea by: Mario Vasquez

	* util/grub.d/00_header.in: Load pf2 and image modules.
---
 ChangeLog                |  7 +++++++
 util/grub.d/00_header.in | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index cbc8ff331..0b77ea6a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	Load fonts and modules for gfxmenu in grub-mkconfig.
+	Idea by: Mario Vasquez
+
+	* util/grub.d/00_header.in: Load pf2 and image modules.
+
 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	grub-mkconfig multiple terminal support.
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 81f7a213a..f99010d6d 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -98,6 +98,32 @@ EOF
 	prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME` | sed -e "s/^/  /"
 	cat << EOF
   insmod gfxmenu
+EOF
+	themedir="`dirname $GRUB_THEME`"
+	for x in "$themedir"/*.pf2 "$themedir"/f/*.pf2; do
+	    if [ -f "$x" ]; then
+		cat << EOF
+  loadfont (\$root)`make_system_path_relative_to_its_root $x`
+EOF
+	    fi
+	done
+	if [ x"`echo "$themedir"/*.jpg`" != x"$themedir/*.jpg" ]; then
+	    cat << EOF
+  insmod jpeg
+EOF
+	fi
+	if [ x"`echo "$themedir"/*.png`" != x"$themedir/*.png" ]; then
+	    cat << EOF
+  insmod png
+EOF
+	fi
+	if [ x"`echo "$themedir"/*.tga`" != x"$themedir/*.tga" ]; then
+	    cat << EOF
+  insmod tga
+EOF
+	fi
+	    
+	cat << EOF
   set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
 EOF
     fi

From d7c43ba1c0e8c2449377c1b3aa43238f985f83da Mon Sep 17 00:00:00 2001
From: Mario Vazquez <mariovazq@gmail.com>
Date: Fri, 9 Apr 2010 17:37:38 +0200
Subject: [PATCH 10/11] 	GRUB_BACKGROUND support.

	* util/grub-mkconfig.in: Export GRUB_BACKGROUND.
	* util/grub.d/00_header.in: Parse GRUB_BACKGROUND.
---
 ChangeLog                |  9 ++++++++-
 util/grub-mkconfig.in    |  1 +
 util/grub.d/00_header.in | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0b77ea6a4..1fdd2a21b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,14 @@
+2010-04-09  Mario Vazquez <mariovazq@gmail.com>
+
+	GRUB_BACKGROUND support.
+
+	* util/grub-mkconfig.in: Export GRUB_BACKGROUND.
+	* util/grub.d/00_header.in: Parse GRUB_BACKGROUND.
+
 2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Load fonts and modules for gfxmenu in grub-mkconfig.
-	Idea by: Mario Vasquez
+	Idea by: Mario Vazquez
 
 	* util/grub.d/00_header.in: Load pf2 and image modules.
 
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 94cd2e199..b98bbc993 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -233,6 +233,7 @@ export GRUB_DEFAULT \
   GRUB_DISABLE_LINUX_UUID \
   GRUB_DISABLE_LINUX_RECOVERY \
   GRUB_GFXMODE \
+  GRUB_BACKGROUND \
   GRUB_THEME \
   GRUB_GFXPAYLOAD_LINUX \
   GRUB_DISABLE_OS_PROBER \
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index f99010d6d..beb9653da 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -125,6 +125,20 @@ EOF
 	    
 	cat << EOF
   set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
+EOF
+    elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \
+	    && is_path_readable_by_grub "$GRUB_BACKGROUND"; then
+	echo "Found background: $GRUB_BACKGROUND" >&2
+	case "$GRUB_BACKGROUND" in 
+	    *.png)         reader=png ;;
+	    *.tga)         reader=tga ;;
+	    *.jpg|*.jpeg)  reader=jpeg ;;
+	    *)             echo "Unsupported image format" >&2; exit 1 ;;
+	esac
+	prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"` | sed -e "s/^/  /"
+	cat << EOF
+  insmod $reader
+  background_image -m stretch `make_system_path_relative_to_its_root "$GRUB_BACKGROUND"`
 EOF
     fi
     cat << EOF

From e215d8e02a47435a54f5c014c2ee99b59153d601 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 9 Apr 2010 17:44:03 +0200
Subject: [PATCH 11/11] 	* util/grub.d/00_header.in: Add few missing quotes.
 Recognise *.jpeg 	as *.jpg.

---
 ChangeLog                |  5 +++++
 util/grub.d/00_header.in | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1fdd2a21b..1db00bc4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub.d/00_header.in: Add few missing quotes. Recognise *.jpeg
+	as *.jpg.
+
 2010-04-09  Mario Vazquez <mariovazq@gmail.com>
 
 	GRUB_BACKGROUND support.
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index beb9653da..d181fdffc 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -84,22 +84,22 @@ fi
 
 if [ "x$gfxterm" = x1 ]; then
     # Make the font accessible
-    prepare_grub_to_access_device `${grub_probe} --target=device ${GRUB_FONT_PATH}`
+    prepare_grub_to_access_device `${grub_probe} --target=device "${GRUB_FONT_PATH}"`
 
     cat << EOF
-if loadfont `make_system_path_relative_to_its_root ${GRUB_FONT_PATH}` ; then
+if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT_PATH}"` ; then
   set gfxmode=${GRUB_GFXMODE}
   insmod gfxterm
   insmod ${GRUB_VIDEO_BACKEND}
 EOF
-    if [ x$GRUB_THEME != x ] && [ -f $GRUB_THEME ] \
-	&& is_path_readable_by_grub $GRUB_THEME; then
+    if [ "x$GRUB_THEME" != x ] && [ -f "$GRUB_THEME" ] \
+	&& is_path_readable_by_grub "$GRUB_THEME"; then
 	echo "Found theme: $GRUB_THEME" >&2
-	prepare_grub_to_access_device `${grub_probe} --target=device $GRUB_THEME` | sed -e "s/^/  /"
+	prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"` | sed -e "s/^/  /"
 	cat << EOF
   insmod gfxmenu
 EOF
-	themedir="`dirname $GRUB_THEME`"
+	themedir="`dirname "$GRUB_THEME"`"
 	for x in "$themedir"/*.pf2 "$themedir"/f/*.pf2; do
 	    if [ -f "$x" ]; then
 		cat << EOF
@@ -107,7 +107,7 @@ EOF
 EOF
 	    fi
 	done
-	if [ x"`echo "$themedir"/*.jpg`" != x"$themedir/*.jpg" ]; then
+	if [ x"`echo "$themedir"/*.jpg`" != x"$themedir/*.jpg" ] || [ x"`echo "$themedir"/*.jpeg`" != x"$themedir/*.jpeg" ]; then
 	    cat << EOF
   insmod jpeg
 EOF