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

bootspec: simplify find_default_boot_entry()

Browse source 
If the only caller passes NULL for the two paths, let's remove the
parameter altogether.
This commit is contained in:
Lennart Poettering 2019-03-01 17:51:15 +01:00
parent c943e95f89
commit 5b1da1ba6d
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/shared/bootspec.c
View file

@ -1295,8 +1295,6 @@ found:
}
int find_default_boot_entry(
const char *esp_path,
const char *xbootldr_path,
BootConfig *config,
const BootEntry **e) {
@ -1306,13 +1304,13 @@ int find_default_boot_entry(
assert(config);
assert(e);
r = find_esp_and_warn(esp_path, false, &esp_where, NULL, NULL, NULL, NULL);
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(xbootldr_path, false, &xbootldr_where, NULL);
r = find_xbootldr_and_warn(NULL, false, &xbootldr_where, NULL);
if (r < 0 && r != -ENOKEY)
return r;

2
src/shared/bootspec.h
View file

@ -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, const char *xbootldr_path, BootConfig *config, const BootEntry **e);
int find_default_boot_entry(BootConfig *config, const BootEntry **e);

2
src/systemctl/systemctl.c
View file

@ -3535,7 +3535,7 @@ static int load_kexec_kernel(void) {
if (access(KEXEC, X_OK) < 0)
return log_error_errno(errno, KEXEC" is not available: %m");
r = find_default_boot_entry(NULL, NULL, &config, &e);
r = find_default_boot_entry(&config, &e);
if (r < 0)
return r;