← Back to branch summary

~hamo/ubuntu/precise/grub2/grub2.hi_res

« back to all changes in this revision

Viewing changes to grub-core/loader/i386/multiboot_mbi.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-01-11 17:11:44 UTC
  • mfrom: (1.17.12 upstream)
  • mto: (17.3.43 sid)
  • mto: This revision was merged to the branch mainline in revision 100.
  • 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:
grub-core/loader/i386/multiboot_mbi.c
539
539
      mbi->u.elf_sec.shndx = elf_sec_shstrndx;
540
540
 
541
541
      mbi->flags |= MULTIBOOT_INFO_ELF_SHDR;
 
542
 
 
543
      ptrorig += elf_sec_entsize * elf_sec_num;
 
544
      ptrdest += elf_sec_entsize * elf_sec_num;
542
545
    }
543
546
 
544
547
  err = retrieve_video_parameters (mbi, ptrorig, ptrdest);
547
550
      grub_print_error ();
548
551
      grub_errno = GRUB_ERR_NONE;
549
552
    }
 
553
 
 
554
  if ((mbi->flags & MULTIBOOT_INFO_FRAMEBUFFER_INFO)
 
555
      && mbi->framebuffer_type == MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED)
 
556
    {
 
557
      ptrorig += mbi->framebuffer_palette_num_colors
 
558
        * sizeof (struct multiboot_color);
 
559
      ptrdest += mbi->framebuffer_palette_num_colors
 
560
        * sizeof (struct multiboot_color);
 
561
    }
 
562
 
550
563
#if GRUB_MACHINE_HAS_VBE
551
564
  ptrorig += sizeof (struct grub_vbe_info_block);
552
565
  ptrdest += sizeof (struct grub_vbe_info_block);