aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-09-11 17:28:09 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-09-11 18:21:04 +0100
commitf01bd6bf93b0962e345593fa504ef91ef5e8dafe (patch)
tree07158397dd3994a1ae83856e8d6b3b4712c73eb6
parent9e657f72da9f5bfb66e534ce5ddeda4d5d9c936d (diff)
downloadsyslinux-f01bd6bf93b0962e345593fa504ef91ef5e8dafe.tar.gz
syslinux-f01bd6bf93b0962e345593fa504ef91ef5e8dafe.tar.xz
syslinux-f01bd6bf93b0962e345593fa504ef91ef5e8dafe.zip
efi: Update the correct copy of hdr
There are two struct linux_header variables in efi_boot(), only one of which points to the boot params that we pass to the kernel we're booting. Fix the initramfs code to update the correct variable, otherwise the kernel won't know about any initramfs we've loaded. Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r--efi/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/efi/main.c b/efi/main.c
index f3f92f5b..e31d529e 100644
--- a/efi/main.c
+++ b/efi/main.c
@@ -905,8 +905,8 @@ int efi_boot_linux(void *kernel_buf, size_t kernel_size,
goto free_map;
}
- hdr->ramdisk_image = (uint32_t)last;
- hdr->ramdisk_size = irf_size;
+ bhdr->ramdisk_image = (uint32_t)last;
+ bhdr->ramdisk_size = irf_size;
/* Copy initramfs into allocated memory */
for (ip = initramfs->next; ip->len; ip = ip->next) {