shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-05 09:17:44 +03:00
Code

bootctl: Make sure bootctl install returns 0 on success

Browse Source 
This backports the same fix from 6e9165397f
in systemd upstream that we can't backport directly because that commit
introduces a new feature.

(cherry picked from commit eb76587f33)
This commit is contained in:
Daan De Meyer 2022-05-24 11:40:53 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent 6100e1dded
commit 6f8adbad80
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/boot/bootctl.c
View File

@ -1852,13 +1852,16 @@ static int verb_install(int argc, char *argv[], void *userdata) {
(void) sync_everything();
if (arg_touch_variables)
r = install_variables(arg_esp_path,
part, pstart, psize, uuid,
"/EFI/systemd/systemd-boot" EFI_MACHINE_TYPE_NAME ".efi",
install);
if (!arg_touch_variables)
return 0;
return r;
r = install_variables(arg_esp_path, part, pstart, psize, uuid,
"/EFI/systemd/systemd-boot" EFI_MACHINE_TYPE_NAME ".efi",
install);
if (r < 0)
return r;
return 0;
}
static int verb_remove(int argc, char *argv[], void *userdata) {