diff options
| author | James Meyer <james.meyer@operamail.com> | 2010-09-20 03:14:50 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2010-09-20 03:14:50 (GMT) |
| commit | 2bf905c893bac50e2536ad24e6ee5a1eac7d6da8 (patch) | |
| tree | 8dbd46664b72c30f54a0d64c0b96b4abf21d62c8 /abs/core-testing/grub-gfx/05-grub-0.97-initrdaddr.diff | |
| parent | 3e1a777d29092423b45330c8190434ac345f91eb (diff) | |
| download | linhes_pkgbuild-2bf905c893bac50e2536ad24e6ee5a1eac7d6da8.zip linhes_pkgbuild-2bf905c893bac50e2536ad24e6ee5a1eac7d6da8.tar.gz linhes_pkgbuild-2bf905c893bac50e2536ad24e6ee5a1eac7d6da8.tar.bz2 | |
grub-gfx: added grub-gfx to replace the standard grub.
Diffstat (limited to 'abs/core-testing/grub-gfx/05-grub-0.97-initrdaddr.diff')
| -rw-r--r-- | abs/core-testing/grub-gfx/05-grub-0.97-initrdaddr.diff | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/abs/core-testing/grub-gfx/05-grub-0.97-initrdaddr.diff b/abs/core-testing/grub-gfx/05-grub-0.97-initrdaddr.diff new file mode 100644 index 0000000..ccf5f3e --- /dev/null +++ b/abs/core-testing/grub-gfx/05-grub-0.97-initrdaddr.diff @@ -0,0 +1,16 @@ +--- grub-0.96/stage2/boot.c ++++ grub-0.96/stage2/boot.c +@@ -824,8 +824,11 @@ + moveto = (mbi.mem_upper + 0x400) << 10; + + moveto = (moveto - len) & 0xfffff000; +- max_addr = (lh->header == LINUX_MAGIC_SIGNATURE && lh->version >= 0x0203 +- ? lh->initrd_addr_max : LINUX_INITRD_MAX_ADDRESS); ++ max_addr = LINUX_INITRD_MAX_ADDRESS; ++ if (lh->header == LINUX_MAGIC_SIGNATURE && ++ lh->version >= 0x0203 && ++ lh->initrd_addr_max < max_addr) ++ max_addr = lh->initrd_addr_max; + if (moveto + len >= max_addr) + moveto = (max_addr - len) & 0xfffff000; + |