shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-12 21:57:27 +03:00
Code

bootctl: 'graceful' should ignore EFI variable failures

Browse Source 
Suppress errors when creating/writing EFI variables during 'bootctl update' if
'--graceful' mode is active (as the documentation indicates).

Closes #26773.

(cherry picked from commit 06d104d58ffa23c958b9b2a2809c61fb25e6f762)
(cherry picked from commit b041337a7a5219398cb304e6cb31456327a7e371)
This commit is contained in:
Kevin P. Fleming 2023-03-21 13:46:08 -04:00 committed by Zbigniew Jędrzejewski-Szmek
parent d9c2ae019a
commit 769d65988d
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/boot/bootctl.c
View File

@ -1126,7 +1126,8 @@ static int install_variables(
uint64_t psize,
sd_id128_t uuid,
const char *path,
bool first) {
bool first,
bool graceful) {
uint16_t slot;
int r;
@ -1149,18 +1150,30 @@ static int install_variables(
return log_error_errno(r, "Cannot access \"%s/%s\": %m", esp_path, path);
r = find_slot(uuid, path, &slot);
if (r < 0)
return log_error_errno(r,
r == -ENOENT ?
"Failed to access EFI variables. Is the \"efivarfs\" filesystem mounted?" :
"Failed to determine current boot order: %m");
if (r < 0) {
int level = graceful ? arg_quiet ? LOG_DEBUG : LOG_INFO : LOG_ERR;
const char *skip = graceful ? ", skipping" : "";
log_full_errno(level, r,
r == -ENOENT ?
"Failed to access EFI variables%s. Is the \"efivarfs\" filesystem mounted?" :
"Failed to determine current boot order%s: %m", skip);
return graceful ? 0 : r;
}
if (first || r == 0) {
r = efi_add_boot_option(slot, pick_efi_boot_option_description(),
part, pstart, psize,
uuid, path);
if (r < 0)
return log_error_errno(r, "Failed to create EFI Boot variable entry: %m");
if (r < 0) {
int level = graceful ? arg_quiet ? LOG_DEBUG : LOG_INFO : LOG_ERR;
const char *skip = graceful ? ", skipping" : "";
log_full_errno(level, r, "Failed to create EFI Boot variable entry%s: %m", skip);
return graceful ? 0 : r;
}
log_info("Created EFI boot entry \"%s\".", pick_efi_boot_option_description());
}
@ -2228,7 +2241,7 @@ static int verb_install(int argc, char *argv[], void *userdata) {
}
char *path = strjoina("/EFI/systemd/systemd-boot", arch, ".efi");
return install_variables(arg_esp_path, part, pstart, psize, uuid, path, install);
return install_variables(arg_esp_path, part, pstart, psize, uuid, path, install, graceful);
}
static int verb_remove(int argc, char *argv[], void *userdata) {