From 6fb3265bae5286e2b6fb1a827a03a831bbaaf9e8 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Mon, 5 Mar 2012 15:24:35 +0000
Subject: [PATCH] Add support for GRUB_CMDLINE_GNUMACH (closes: #660493).

---
 debian/changelog                      |  1 +
 debian/patches/mkconfig_gnumach.patch | 53 +++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 55 insertions(+)
 create mode 100644 debian/patches/mkconfig_gnumach.patch

diff --git a/debian/changelog b/debian/changelog
index 69a317712..26cbe6014 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ grub2 (1.99-15) UNRELEASED; urgency=low
       (Note that this moves grub-mkconfig_lib and update-grub_lib to
       /usr/share/grub; I added links in /usr/lib/grub for compatibility.)
     - Fix incorrect identifiers in bash-completion (closes: #661415).
+    - Add support for GRUB_CMDLINE_GNUMACH (closes: #660493).
   * Build with GCC 4.6 (closes: #654727).
 
   [ Debconf translations ]
diff --git a/debian/patches/mkconfig_gnumach.patch b/debian/patches/mkconfig_gnumach.patch
new file mode 100644
index 000000000..2c28ef5ea
--- /dev/null
+++ b/debian/patches/mkconfig_gnumach.patch
@@ -0,0 +1,53 @@
+Description: Add support for GRUB_CMDLINE_GNUMACH
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Origin: upstream, http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/3942
+Last-Update: 2012-03-05
+
+Index: b/docs/grub.texi
+===================================================================
+--- a/docs/grub.texi
++++ b/docs/grub.texi
+@@ -1167,6 +1167,9 @@
+ As @samp{GRUB_CMDLINE_LINUX} and @samp{GRUB_CMDLINE_LINUX_DEFAULT}, but for
+ NetBSD.
+ 
++@item GRUB_CMDLINE_GNUMACH
++As @samp{GRUB_CMDLINE_LINUX}, but for GNU Mach.
++
+ @item GRUB_CMDLINE_XEN
+ @itemx GRUB_CMDLINE_XEN_DEFAULT
+ The values of these options are appended to the values of
+Index: b/util/grub-mkconfig.in
+===================================================================
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -244,6 +244,7 @@
+   GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT \
+   GRUB_CMDLINE_NETBSD \
+   GRUB_CMDLINE_NETBSD_DEFAULT \
++  GRUB_CMDLINE_GNUMACH \
+   GRUB_TERMINAL_INPUT \
+   GRUB_TERMINAL_OUTPUT \
+   GRUB_SERIAL_COMMAND \
+Index: b/util/grub.d/10_hurd.in
+===================================================================
+--- a/util/grub.d/10_hurd.in
++++ b/util/grub.d/10_hurd.in
+@@ -84,7 +84,7 @@
+   message="$(gettext_printf "Loading GNU Mach ...")"
+   cat << EOF
+ 	echo		'$message'
+-	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/}
++	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/} ${GRUB_CMDLINE_GNUMACH}
+ EOF
+   save_default_entry | sed -e "s/^/\t/"
+   prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
+@@ -108,7 +108,7 @@
+   message="$(gettext_printf "Loading GNU Mach ...")"
+   cat << EOF
+ 	echo		'$message'
+-	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/} -s
++	multiboot	${kernel} root=device:${GRUB_DEVICE#/dev/} -s ${GRUB_CMDLINE_GNUMACH}
+ EOF
+   prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/"
+   message="$(gettext_printf "Loading the Hurd ...")"
diff --git a/debian/patches/series b/debian/patches/series
index 3a5638fc7..bca600d00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -34,3 +34,4 @@ xfs_invalid_bmap.patch
 handle_new_autotools.patch
 efi_disk_cache.patch
 bash-completion_identifiers.patch
+mkconfig_gnumach.patch