SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bootspec: rework find_default_boot_entry() to use boot_entries_load_config_auto()

Browse Source 
it's pretty much the same code now, hence use it.
This commit is contained in:
Lennart Poettering
2019-03-05 16:50:58 +01:00
parent eea4ce1ec7
commit b1a8771996
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/bootspec.c
+2 -13
View File
@@ -1416,25 +1416,14 @@ int find_default_boot_entry(
BootConfig *config,
const BootEntry **e) {
_cleanup_free_ char *esp_where = NULL, *xbootldr_where = NULL;
int r;
assert(config);
assert(e);
r = find_esp_and_warn(NULL, false, &esp_where, NULL, NULL, NULL, NULL);
if (r == -ENOKEY) /* find_esp_and_warn() doesn't warn about this case */
return log_error_errno(r, "Cannot find the ESP partition mount point.");
if (r < 0) /* But it logs about all these cases, hence don't log here again */
return r;
r = find_xbootldr_and_warn(NULL, false, &xbootldr_where, NULL);
if (r < 0 && r != -ENOKEY)
return r;
r = boot_entries_load_config(esp_where, xbootldr_where, config);
r = boot_entries_load_config_auto(NULL, NULL, config);
if (r < 0)
return log_error_errno(r, "Failed to load boot loader entries: %m");
return r;
if (config->default_entry < 0)
return log_error_errno(SYNTHETIC_ERRNO(ENOENT),