diff options
author | Lennart Poettering <lennart@poettering.net> | 2019-01-28 18:56:53 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2019-03-01 12:41:32 +0100 |
commit | a2f8664e9a544d7547f4fcdbfe2fa6396b8f7654 (patch) | |
tree | 3c91aca1788d4946d0f3e244661ee97e1c9c5f9f /src/shared/bootspec.h | |
parent | 9fc32cd9b3a8bbce64a0a48a0f186d367b7f88ce (diff) | |
download | systemd-a2f8664e9a544d7547f4fcdbfe2fa6396b8f7654.tar.gz |
bootspec: load entries from both the ESP and XBOOTLDR partitions
Let's simply search in both.
Diffstat (limited to 'src/shared/bootspec.h')
-rw-r--r-- | src/shared/bootspec.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/bootspec.h b/src/shared/bootspec.h index 0fac051398..f184902558 100644 --- a/src/shared/bootspec.h +++ b/src/shared/bootspec.h @@ -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); |