From: Clayton Craft <clayton@craftyguy.net>
Date: Tue, 12 May 2026 17:47:17 +0000 (-0700)
Subject: bootctl: rename install_variables/remove_variables to install/remove_boot_option
X-Git-Tag: v261-rc1~24^2~5
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=1027cbd8ae6a01799e8f4c002a2d46ee3a8043a9;p=thirdparty%2Fsystemd.git

bootctl: rename install_variables/remove_variables to install/remove_boot_option

These functions install or remove a single EFI Boot#### entry, not
"all variables," so this renames them to better reflect what they do.
---

diff --git a/src/bootctl/bootctl-install.c b/src/bootctl/bootctl-install.c
index 535019e1e9f..4478f78eb35 100644
--- a/src/bootctl/bootctl-install.c
+++ b/src/bootctl/bootctl-install.c
@@ -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());
 }