From 024478a2d8fba8fc6d26f61480058fc64de353fc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 18 Nov 2009 18:54:23 +0100
Subject: [PATCH 1/2] Fixed bug which causes some commands to be masked

---
 normal/dyncmd.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/normal/dyncmd.c b/normal/dyncmd.c
index 6e5028906..edaf614b8 100644
--- a/normal/dyncmd.c
+++ b/normal/dyncmd.c
@@ -78,14 +78,22 @@ read_command_list (void)
 	  if (file)
 	    {
 	      char *buf = NULL;
+	      grub_command_t ptr, last = 0, next;
 
 	      /* Override previous commands.lst.  */
-	      while (grub_command_list)
+	      for (ptr = grub_command_list; ptr; ptr = next)
 		{
-		  grub_command_t tmp;
-		  tmp = grub_command_list->next;
-		  grub_free (grub_command_list);
-		  grub_command_list = tmp;
+		  next = ptr->next;
+		  if (ptr->func == grub_dyncmd_dispatcher)
+		    {
+		      if (last)
+			last->next = ptr->next;
+		      else
+			grub_command_list = ptr->next;
+		      grub_free (ptr);
+		    }
+		  else
+		    last = ptr;
 		}
 
 	      for (;; grub_free (buf))

From 5d2c52b8ca8c20cf527eaad3afc5e48e41ff8f6e Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@aybabtu.com>
Date: Thu, 7 Jan 2010 19:55:16 +0000
Subject: [PATCH 2/2] 2010-01-07  Robert Millan  <rmh.grub@aybabtu.com>

	* include/multiboot.h (MULTIBOOT_UNSUPPORTED): Moved from here ...
	* loader/i386/multiboot.c (UNSUPPORTED_FLAGS): ... to here.  Update
	all users.
---
 ChangeLog               | 6 ++++++
 include/multiboot.h     | 3 ---
 loader/i386/multiboot.c | 5 ++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5823bd8f..d7b84f6b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-07  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* include/multiboot.h (MULTIBOOT_UNSUPPORTED): Moved from here ...
+	* loader/i386/multiboot.c (UNSUPPORTED_FLAGS): ... to here.  Update
+	all users.
+
 2010-01-07  Robert Millan  <rmh.grub@aybabtu.com>
 2010-01-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
diff --git a/include/multiboot.h b/include/multiboot.h
index 587f50832..da7afd9b3 100644
--- a/include/multiboot.h
+++ b/include/multiboot.h
@@ -31,9 +31,6 @@
 /* This should be in %eax.  */
 #define MULTIBOOT_BOOTLOADER_MAGIC		0x2BADB002
 
-/* The bits in the required part of flags field we don't support.  */
-#define MULTIBOOT_UNSUPPORTED			0x0000fffc
-
 /* Alignment of multiboot modules.  */
 #define MULTIBOOT_MOD_ALIGN			0x00001000
 
diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index a52b8d5d6..f4869594e 100644
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -27,6 +27,9 @@
  *  - APM table
  */
 
+/* The bits in the required part of flags field we don't support.  */
+#define UNSUPPORTED_FLAGS			0x0000fffc
+
 #include <grub/loader.h>
 #include <grub/machine/loader.h>
 #include <grub/multiboot.h>
@@ -261,7 +264,7 @@ grub_multiboot (int argc, char *argv[])
       goto fail;
     }
 
-  if (header->flags & MULTIBOOT_UNSUPPORTED)
+  if (header->flags & UNSUPPORTED_FLAGS)
     {
       grub_error (GRUB_ERR_UNKNOWN_OS,
 		  "unsupported flag: 0x%x", header->flags);