picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sd-boot: simplify memory management in processing of unified kernel image a bit

Browse source
This commit is contained in:
Lennart Poettering 2018-06-20 23:32:21 +02:00
parent 42cf81c26f
commit 2214cfbf50
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/boot/efi/boot.c
View file

@ -1644,15 +1644,16 @@ static VOID config_entry_add_linux(
}
if (os_name && os_id && (os_version || os_build)) {
CHAR16 *conf;
CHAR16 *path;
_cleanup_freepool_ CHAR16 *conf = NULL, *path = NULL;
conf = PoolPrint(L"%s-%s", os_id, os_version ? : os_build);
path = PoolPrint(L"\\EFI\\Linux\\%s", f->FileName);
entry = config_entry_add_loader(config, loaded_image->DeviceHandle, LOADER_LINUX, conf, 'l', os_name, path);
FreePool(content);
content = NULL;
/* read the embedded cmdline file */
err = file_read(linux_dir, f->FileName, offs[1], szs[1], &content, NULL);
if (!EFI_ERROR(err)) {
@ -1663,9 +1664,6 @@ static VOID config_entry_add_linux(
entry->options = stra_to_str(content);
}
FreePool(conf);
FreePool(path);
}
FreePool(os_name);