From 86205c94c3f85579f56b005896c4ad3cf0c69d00 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 11 Jan 2011 09:08:57 -0600
Subject: [PATCH] * util/grub-mklayout.c (console_grub_equivalences_shift):
 Terminate with NULL. (console_grub_equivalences_unshift): Likewise. Reported
 by: Daniel Dehennin.

---
 ChangeLog            | 7 +++++++
 util/grub-mklayout.c | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a4f7122fb..56a8db213 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-11  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-mklayout.c (console_grub_equivalences_shift): Terminate
+	with NULL.
+	(console_grub_equivalences_unshift): Likewise.
+	Reported by: Daniel Dehennin.
+
 2011-01-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/i386/pc/pxe.c (set_mac_env): Export variable.
diff --git a/util/grub-mklayout.c b/util/grub-mklayout.c
index 36f6e04fc..04501cb40 100644
--- a/util/grub-mklayout.c
+++ b/util/grub-mklayout.c
@@ -60,6 +60,8 @@ static struct console_grub_equivalence console_grub_equivalences_shift[] = {
   {"KP_8", '8'},
   {"KP_9", '9'},
   {"KP_Period", '.'},
+
+  {NULL, '\0'}
 };
 
 static struct console_grub_equivalence console_grub_equivalences_unshift[] = {
@@ -74,6 +76,8 @@ static struct console_grub_equivalence console_grub_equivalences_unshift[] = {
   {"KP_8", GRUB_TERM_KEY_UP},
   {"KP_9", GRUB_TERM_KEY_PPAGE},
   {"KP_Period", GRUB_TERM_KEY_DC},
+
+  {NULL, '\0'}
 };
 
 static struct console_grub_equivalence console_grub_equivalences_common[] = {