morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

bootspec: Fixup loading of local addons for UKIs

Browse Source 
Follow-up for 59b3df9
This commit is contained in:
Adrian Vovk
2024-10-30 15:38:49 -04:00
parent e2501a851e
commit ef370a3c30
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/shared/bootspec.c
View File

@@ -1215,16 +1215,18 @@ static int boot_entries_find_unified(
if (r < 0)
continue;
if (!GREEDY_REALLOC0(config->entries, config->n_entries + 2))
if (!GREEDY_REALLOC0(config->entries, config->n_entries + 1))
return log_oom();
if (boot_entry_load_unified(root, j, p, osrelease, profile, cmdline, config->entries + config->n_entries) < 0)
BootEntry *entry = config->entries + config->n_entries;
if (boot_entry_load_unified(root, j, p, osrelease, profile, cmdline, entry) < 0)
continue;
config->n_entries++;
/* look for .efi.extra.d */
(void) boot_entries_find_unified_local_addons(config, dirfd(d), de->d_name, full, config->entries + config->n_entries);
(void) boot_entries_find_unified_local_addons(config, dirfd(d), de->d_name, full, entry);
config->n_entries++;
}
}