← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/branch_embed-sectors.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/branch_embed-sectors.patch
130
130
===================================================================
131
131
--- a/util/grub-setup.c
132
132
+++ b/util/grub-setup.c
133
 
@@ -443,6 +443,13 @@
 
133
@@ -459,6 +459,13 @@
134
134
       save_blocklists (sectors[i] + grub_partition_get_start (container),
135
135
                       0, GRUB_DISK_SECTOR_SIZE);
136
136
 
144
144
     write_rootdev (core_img, root_dev, boot_img, first_sector);
145
145
 
146
146
     core_img = realloc (core_img, nsec * GRUB_DISK_SECTOR_SIZE);
147
 
@@ -459,12 +466,6 @@
 
147
@@ -475,12 +482,6 @@
148
148
                                      nsec * GRUB_DISK_SECTOR_SIZE
149
149
                                      - core_size);
150
150