From a109bb6d0eb936ac4e2a9f0ee46a269a58ec48ce Mon Sep 17 00:00:00 2001
From: root <root@arianrhod.panaceas.james.local>
Date: Fri, 16 Nov 2012 11:52:02 +0000
Subject: fish

---
 master/debian/xen_replace.patch | 64 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 master/debian/xen_replace.patch

(limited to 'master/debian/xen_replace.patch')

diff --git a/master/debian/xen_replace.patch b/master/debian/xen_replace.patch
new file mode 100644
index 0000000..84df6b3
--- /dev/null
+++ b/master/debian/xen_replace.patch
@@ -0,0 +1,64 @@
+Description: New GRUB_CMDLINE_LINUX_XEN_REPLACE* options
+ Honour GRUB_CMDLINE_LINUX_XEN_REPLACE and
+ GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT, which replace GRUB_CMDLINE_LINUX
+ and GRUB_CMDLINE_LINUX_DEFAULT (complementing the existing options which
+ append).
+Author: Colin Watson <cjwatson@ubuntu.com>
+Bug-Debian: http://bugs.debian.org/617538
+Forwarded: yes
+Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/3294
+Last-Update: 2011-08-08
+
+Index: b/docs/grub.texi
+===================================================================
+--- a/docs/grub.texi
++++ b/docs/grub.texi
+@@ -1169,8 +1169,14 @@
+ 
+ @item GRUB_CMDLINE_XEN
+ @itemx GRUB_CMDLINE_XEN_DEFAULT
+-As @samp{GRUB_CMDLINE_LINUX} and @samp{GRUB_CMDLINE_LINUX_DEFAULT}, but for
+-Linux and Xen.
++The values of these options are appended to the values of
++@samp{GRUB_CMDLINE_LINUX} and @samp{GRUB_CMDLINE_LINUX_DEFAULT} for Linux
++and Xen menu entries.
++
++@item GRUB_CMDLINE_LINUX_XEN_REPLACE
++@item GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT
++The values of these options replace the values of @samp{GRUB_CMDLINE_LINUX}
++and @samp{GRUB_CMDLINE_LINUX_DEFAULT} for Linux and Xen menu entries.
+ 
+ @item GRUB_DISABLE_LINUX_UUID
+ Normally, @command{grub-mkconfig} will generate menu entries that use
+Index: b/util/grub.d/20_linux_xen.in
+===================================================================
+--- a/util/grub.d/20_linux_xen.in
++++ b/util/grub.d/20_linux_xen.in
+@@ -56,6 +56,14 @@
+   LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
+ fi
+ 
++# Allow overriding GRUB_CMDLINE_LINUX and GRUB_CMDLINE_LINUX_DEFAULT.
++if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE}" ]; then
++  GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX_XEN_REPLACE}"
++fi
++if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" ]; then
++  GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}"
++fi
++
+ if [ "x`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" = xbtrfs ] \
+     || [ "x`stat -f --printf=%T /`" = xbtrfs ]; then
+   rootsubvol="`make_system_path_relative_to_its_root /`"
+Index: b/util/grub-mkconfig.in
+===================================================================
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -239,6 +239,8 @@
+   GRUB_CMDLINE_LINUX_DEFAULT \
+   GRUB_CMDLINE_XEN \
+   GRUB_CMDLINE_XEN_DEFAULT \
++  GRUB_CMDLINE_LINUX_XEN_REPLACE \
++  GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT \
+   GRUB_CMDLINE_NETBSD \
+   GRUB_CMDLINE_NETBSD_DEFAULT \
+   GRUB_TERMINAL_INPUT \
-- 
cgit v1.2.3