diff options
| author | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2024-05-24 14:54:26 +0200 |
|---|---|---|
| committer | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2024-06-10 11:43:36 +0200 |
| commit | bf03333d09669371ed2ee90a8ccddccc7d8aaa24 (patch) | |
| tree | 00bcfaae206b6b59b24750ef096867019274c8a6 /cmd/eficonfig.c | |
| parent | 4f836fb324ba500ecabdba4146c3ca9e1600cdf5 (diff) | |
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>
Diffstat (limited to 'cmd/eficonfig.c')
| -rw-r--r-- | cmd/eficonfig.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index 4164cb4f9b8..7bb92e510dc 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -530,7 +530,7 @@ struct efi_device_path *eficonfig_create_device_path(struct efi_device_path *dp_ dp = efi_dp_shorten(dp_volume); if (!dp) dp = dp_volume; - dp = efi_dp_concat(dp, &fp->dp, false); + dp = efi_dp_concat(dp, &fp->dp, 0); free(buf); return dp; @@ -1484,7 +1484,7 @@ static efi_status_t eficonfig_edit_boot_option(u16 *varname, struct eficonfig_bo goto out; } initrd_dp = efi_dp_concat((const struct efi_device_path *)&id_dp, - dp, false); + dp, 0); efi_free_pool(dp); } @@ -1495,7 +1495,7 @@ static efi_status_t eficonfig_edit_boot_option(u16 *varname, struct eficonfig_bo } final_dp_size = efi_dp_size(dp) + sizeof(END); if (initrd_dp) { - final_dp = efi_dp_concat(dp, initrd_dp, true); + final_dp = efi_dp_concat(dp, initrd_dp, 1); final_dp_size += efi_dp_size(initrd_dp) + sizeof(END); } else { final_dp = efi_dp_dup(dp); |