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

Merge pull request #13303 from yuwata/bootctl-segfaults 

bootctl: fix segfaults
This commit is contained in:
Frantisek Sumsal 2019-08-12 19:16:51 +00:00 committed by GitHub
parent d1bdafd214 f8a2b09a18
commit d397d2b220
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/boot/bootctl.c
View File

@ -103,6 +103,7 @@ static int acquire_xbootldr(bool unprivileged_mode, sd_id128_t *ret_uuid) {
log_debug_errno(r, "Didn't find an XBOOTLDR partition, using the ESP as $BOOT.");
if (ret_uuid)
*ret_uuid = SD_ID128_NULL;
arg_xbootldr_path = mfree(arg_xbootldr_path);
return 0;
}
if (r < 0)
@ -1175,7 +1176,11 @@ static int verb_status(int argc, char *argv[], void *userdata) {
if (r < 0)
return r;
puts(arg_dollar_boot_path());
const char *path = arg_dollar_boot_path();
if (!path)
return log_error_errno(SYNTHETIC_ERRNO(EACCES), "Failed to determine XBOOTLDR location: %m");
puts(path);
}
if (arg_print_esp_path || arg_print_dollar_boot_path)