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

bootspec: load entries from both the ESP and XBOOTLDR partitions

Browse Source 
Let's simply search in both.
This commit is contained in:
Lennart Poettering
2019-03-01 12:41:32 +01:00
parent 9fc32cd9b3
commit a2f8664e9a
4 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/bootspec.h
+2 -2
View File
@@ -41,7 +41,7 @@ typedef struct BootConfig {
} BootConfig;
void boot_config_free(BootConfig *config);
int boot_entries_load_config(const char *esp_path, BootConfig *config);
int boot_entries_load_config(const char *esp_path, const char *xbootldr_path, BootConfig *config);
static inline const char* boot_entry_title(const BootEntry *entry) {
return entry->show_title ?: entry->title ?: entry->id;
@@ -50,4 +50,4 @@ static inline const char* boot_entry_title(const BootEntry *entry) {
int find_esp_and_warn(const char *path, bool unprivileged_mode, char **ret_path, uint32_t *ret_part, uint64_t *ret_pstart, uint64_t *ret_psize, sd_id128_t *ret_uuid);
int find_xbootldr_and_warn(const char *path, bool unprivileged_mode, char **ret_path,sd_id128_t *ret_uuid);
int find_default_boot_entry(const char *esp_path, BootConfig *config, const BootEntry **e);
int find_default_boot_entry(const char *esp_path, const char *xbootldr_path, BootConfig *config, const BootEntry **e);