← Back to branch summary

~ubuntu-branches/ubuntu/vivid/grub2/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/insmod-xzio-and-lzopio-on-xen.patch

  • Committer: Package Import Robot
  • Author(s): Ian Campbell, Colin Watson, Ian Campbell
  • Date: 2014-11-30 17:15:21 UTC
  • Revision ID: package-import@ubuntu.com-20141130171521-jtqle9j0ckcww9wy
Tags: 2.02~beta2-17
https://launchpad.net/bugs/1390766
http://bugs.debian.org/770412
http://bugs.debian.org/755256
[ Colin Watson ]
* Fix up some pointer-to-integer casts in linuxefi so that it can build on
  i386-efi.
* Backport from upstream:
  - Fix typo (gettext_print instead of gettext_printf) (LP: #1390766).

[ Ian Campbell ]
* Correct syntax error in grub-xen-host bootstrap configuration file.
* Log failure when grub-install fails in postinst, rather than failing the
  entire postinst. (Closes: #770412)
* Arrange to insmod xzio and lzopio when booting a kernel as a Xen guest.
  (Closes: #755256)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/insmod-xzio-and-lzopio-on-xen.patch
 
1
From b837a9997cb306dc9aaeb3308f05d08cef402456 Mon Sep 17 00:00:00 2001
 
2
From: Ian Campbell <ijc@debian.org>
 
3
Date: Sun, 30 Nov 2014 12:12:52 +0000
 
4
Subject: Arrange to insmod xzio and lzopio when booting a kernel as a Xen
 
5
 guest
 
6
 
 
7
This is needed in case the Linux kernel is compiled with CONFIG_KERNEL_XZ or
 
8
CONFIG_KERNEL_LZO rather than CONFIG_KERNEL_GZ (gzio is already loaded by
 
9
grub.cfg today).
 
10
 
 
11
Signed-off-by: Ian Campbell <ijc@debian.org>
 
12
 
 
13
Bug-Debian: https://bugs.debian.org/755256
 
14
Forwarded: http://lists.gnu.org/archive/html/grub-devel/2014-11/msg00091.html
 
15
Last-Update: 2014-11-30
 
16
 
 
17
Patch-Name: insmod-xzio-and-lzopio-on-xen.patch
 
18
---
 
19
 util/grub.d/10_linux.in | 1 +
 
20
 1 file changed, 1 insertion(+)
 
21
 
 
22
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
 
23
index 79fa03a..86e35f2 100644
 
24
--- a/util/grub.d/10_linux.in
 
25
+++ b/util/grub.d/10_linux.in
 
26
@@ -150,6 +150,7 @@ linux_entry ()
 
27
   fi
 
28
 
 
29
   echo "       insmod gzio" | sed "s/^/$submenu_indentation/"
 
30
+  echo "       if [ x\$grub_platform = xxen ]; then insmod xzio; insmod lzopio; fi" | sed "s/^/$submenu_indentation/"
 
31
 
 
32
   if [ x$dirname = x/ ]; then
 
33
     if [ -z "${prepare_root_cache}" ]; then