efi_loader: allow concatenation with contained end node
Allow appending a device-path to a device-path that contains an end node
as separator. We need this feature for creating boot options specifying
kernel, initrd, and dtb.
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
diff --git a/cmd/efidebug.c b/cmd/efidebug.c
index e978e74..186d62e 100644
--- a/cmd/efidebug.c
+++ b/cmd/efidebug.c
@@ -696,7 +696,7 @@
short_fp = tmp_fp;
initrd_dp = efi_dp_concat((const struct efi_device_path *)&id_dp,
- short_fp, false);
+ short_fp, 0);
out:
efi_free_pool(tmp_dp);
@@ -916,7 +916,7 @@
goto out;
}
- final_fp = efi_dp_concat(file_path, initrd_dp, true);
+ final_fp = efi_dp_concat(file_path, initrd_dp, 1);
if (!final_fp) {
printf("Cannot create final device path\n");
r = CMD_RET_FAILURE;