vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

arm-uboot, ia64, sparc64: Fix up grub_file_open() calls

Browse source 
The verifiers framework changed the grub_file_open() interface, breaking all
non-x86 linux loaders. Add file types to the grub_file_open() calls to make
them build again.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Leif Lindholm 2018-11-14 19:29:19 +00:00 committed by Daniel Kiper
parent 9d0559c647
commit 58bfe43581
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
grub-core/loader/arm/linux.c
View file

@ -363,7 +363,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
if (argc == 0) if (argc == 0)
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
file = grub_file_open (argv[0]); file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL);
if (!file) if (!file)
goto fail; goto fail;
@ -408,7 +408,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
if (argc == 0) if (argc == 0)
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
file = grub_file_open (argv[0]); file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_INITRD);
if (!file) if (!file)
return grub_errno; return grub_errno;
@ -471,7 +471,7 @@ grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)),
if (argc != 1) if (argc != 1)
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected")); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
dtb = grub_file_open (argv[0]); dtb = grub_file_open (argv[0], GRUB_FILE_TYPE_DEVICE_TREE_IMAGE);
if (!dtb) if (!dtb)
return grub_errno; return grub_errno;

2
grub-core/loader/ia64/efi/linux.c
View file

@ -460,7 +460,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
goto fail; goto fail;
} }
file = grub_file_open (argv[0]); file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL);
if (! file) if (! file)
goto fail; goto fail;

2
grub-core/loader/sparc64/ieee1275/linux.c
View file

@ -306,7 +306,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
goto out; goto out;
} }
file = grub_file_open (argv[0]); file = grub_file_open (argv[0], GRUB_FILE_TYPE_LINUX_KERNEL);
if (!file) if (!file)
goto out; goto out;