← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/linuxefi_debug.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/linuxefi_debug.patch
1
 
From 935cb0d861b3e0a0ab9340f7f1527fa1d0d388af Mon Sep 17 00:00:00 2001
 
1
From 755d4a32dc78349fb80a966e9fb150bc8cfd6426 Mon Sep 17 00:00:00 2001
2
2
From: Colin Watson <cjwatson@ubuntu.com>
3
3
Date: Mon, 13 Jan 2014 12:13:18 +0000
4
4
Subject: Add more debugging to linuxefi
12
12
 1 file changed, 25 insertions(+), 3 deletions(-)
13
13
 
14
14
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
15
 
index b79e632..a124c5e 100644
 
15
index ebaf1db..2bf38fa 100644
16
16
--- a/grub-core/loader/i386/efi/linux.c
17
17
+++ b/grub-core/loader/i386/efi/linux.c
18
18
@@ -19,6 +19,7 @@
61
61
+  grub_dprintf ("linuxefi", "initrd_mem = %lx\n", (unsigned long) initrd_mem);
62
62
+
63
63
   params->ramdisk_size = size;
64
 
   params->ramdisk_image = (grub_uint32_t)(grub_uint64_t) initrd_mem;
 
64
   params->ramdisk_image = (grub_uint32_t)(grub_addr_t) initrd_mem;
65
65
 
66
66
@@ -236,6 +251,8 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
67
67
       goto fail;