← Back to branch summary

~ubuntu-branches/ubuntu/wily/grub2/wily

« back to all changes in this revision

Viewing changes to debian/patches/core_in_fs.patch

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-01-11 17:11:44 UTC
  • mfrom: (1.15.12 upstream)
  • mto: This revision was merged to the branch mainline in revision 60.
  • Revision ID: james.westby@ubuntu.com-20110111171144-c4c3hc0jslqa1bxe
Tags: 1.99~20110111-1
http://bugs.debian.org/588293
https://launchpad.net/bugs/513528
https://launchpad.net/bugs/691878
http://bugs.debian.org/609584
https://launchpad.net/bugs/697493
http://bugs.debian.org/609671
* New Bazaar snapshot.
  - Don't check amount of low memory, as reportedly INT 12h can be broken
    and if low memory is too low we wouldn't have gotten into
    grub_machine_init anyway (closes: #588293, LP: #513528).
  - Submenu default support (LP: #691878).
  - Fix optimisation-dependent grub-mklayout crash (closes: #609584).
* branch_butter.patch: Don't free an uninitialised pointer if /proc is
  unmounted (LP: #697493).
* Add a po/LINGUAS file listing the translations we've synced from the TP
  (closes: #609671).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/core_in_fs.patch
2
2
===================================================================
3
3
--- a/util/grub-setup.c
4
4
+++ b/util/grub-setup.c
5
 
@@ -75,6 +75,7 @@
 
5
@@ -76,6 +76,7 @@
6
6
 
7
7
 #define DEFAULT_BOOT_FILE      "boot.img"
8
8
 #define DEFAULT_CORE_FILE      "core.img"
10
10
 
11
11
 #ifdef GRUB_MACHINE_SPARC64
12
12
 #define grub_target_to_host16(x)       grub_be_to_cpu16(x)
13
 
@@ -472,6 +473,8 @@
 
13
@@ -488,6 +489,8 @@
14
14
 
15
15
     grub_free (sectors);
16
16
 
19
19
     goto finish;
20
20
   }
21
21
 #endif
22
 
@@ -497,6 +500,9 @@
 
22
@@ -513,6 +516,9 @@
23
23
   /* The core image must be put on a filesystem unfortunately.  */
24
24
   grub_util_info ("will leave the core image on the filesystem");
25
25