SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bootctl: rename install_variables/remove_variables to install/remove_boot_option

Browse Source 
These functions install or remove a single EFI Boot#### entry, not
"all variables," so this renames them to better reflect what they do.
This commit is contained in:
Clayton Craft
2026-05-21 11:26:59 -07:00
parent a2ba538ead
commit 1027cbd8ae
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bootctl/bootctl-install.c
+4 -4
View File
@@ -1352,7 +1352,7 @@ fallback:
return 0;
}
static int install_variables(
static int install_boot_option(
InstallContext *c,
const char *path) {
@@ -1632,7 +1632,7 @@ static int run_install(InstallContext *c) {
}
char *path = strjoina("/EFI/systemd/systemd-boot", arch, ".efi");
return install_variables(c, path);
return install_boot_option(c, path);
}
int verb_install(int argc, char *argv[], uintptr_t _data, void *userdata) {
@@ -1810,7 +1810,7 @@ static int remove_binaries(InstallContext *c) {
return RET_GATHER(r, remove_boot_efi(c));
}
static int remove_variables(sd_id128_t uuid, const char *path, bool in_order) {
static int remove_boot_option(sd_id128_t uuid, const char *path, bool in_order) {
uint16_t slot;
int r;
@@ -1926,7 +1926,7 @@ int verb_remove(int argc, char *argv[], uintptr_t _data, void *userdata) {
}
char *path = strjoina("/EFI/systemd/systemd-boot", get_efi_arch(), ".efi");
RET_GATHER(r, remove_variables(c.esp_uuid, path, /* in_order= */ true));
RET_GATHER(r, remove_boot_option(c.esp_uuid, path, /* in_order= */ true));
return RET_GATHER(r, remove_loader_variables());
}