Rename "system-options" to "systemd-efi-options"

This makes the naming more consistent: we now have
bootctl systemd-efi-options,
$SYSTEMD_EFI_OPTIONS
and the SystemdOptions EFI variable.

(SystemdEFIOptions would be redundant, because it is only used in the context
of efivars, and users don't interact with that name directly.)

bootctl is adjusted to use 2sp indentation, similarly to systemctl and other
programs.

Remove the prefix with the old name from 'bootctl systemd-efi-options' output,
since it's redundant and we don't want the old name anyway.

diff --git a/NEWS b/NEWS
index 67a2fc360451b75aa6601d2273efaed6ccd0d1cf..84ca2dc4d5b299ff082da0d39c128d7fba90a751 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,7 @@ CHANGES WITH 244 in spe:
           SystemdOptions. This may be used to configure systemd behaviour when
           modifying the kernel command line is inconvenient, but configuration
           on disk is read too late, for example for the options related to
-          cgroup hierarchy setup. 'bootctl system-options' may be used to
+          cgroup hierarchy setup. 'bootctl systemd-efi-options' may be used to
           set the EFI variable.
 
         * systemd will now disable printk ratelimits in early boot. This should

diff --git a/docs/ENVIRONMENT.md b/docs/ENVIRONMENT.md
index 4882cab6005cb2b51e3f4f7ad361ccb61d7a6eb1..a3837ebfdb8e8a0a8e86ef8b8870b178cade2183 100644 (file)
--- a/docs/ENVIRONMENT.md
+++ b/docs/ENVIRONMENT.md
@@ -47,8 +47,8 @@ All tools:
 * `$SYSTEMD_CRYPTTAB` — if set, use this path instead of /etc/crypttab. Only
   useful for debugging. Currently only supported by systemd-cryptsetup-generator.
 
-* `$SYSTEMD_EFI_OPTIONS` — if set, used instead of the string in SystemdOptions
-  EFI variable. Analogous to `$SYSTEMD_PROC_CMDLINE`.
+* `$SYSTEMD_EFI_OPTIONS` — if set, used instead of the string in the
+  SystemdOptions EFI variable. Analogous to `$SYSTEMD_PROC_CMDLINE`.
 
 * `$SYSTEMD_IN_INITRD` — takes a boolean. If set, overrides initrd detection.
   This is useful for debugging and testing initrd-only programs in the main

diff --git a/man/bootctl.xml b/man/bootctl.xml
index 7f3e74e677432f9622e563dfb35d39232663e186..fbd6574418114cae9a9dfebea17dcbc9efdb1e7f 100644 (file)
--- a/man/bootctl.xml
+++ b/man/bootctl.xml
@@ -102,7 +102,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>system-options</option> <optional><replaceable>VALUE</replaceable></optional></term>
+        <term><option>systemd-efi-options</option> <optional><replaceable>VALUE</replaceable></optional></term>
 
         <listitem><para>When called without the optional argument, prints the current value of the
         <literal>SystemdOptions</literal> EFI variable. When called with an argument, sets the

diff --git a/src/basic/efivars.c b/src/basic/efivars.c
index daa66ac2d9d5951ceda85035ff776c72ab71d4f9..7b14c062df1df251cf89c04c318663b06cce906a 100644 (file)
--- a/src/basic/efivars.c
+++ b/src/basic/efivars.c
@@ -220,7 +220,7 @@ int efi_set_variable_string(sd_id128_t vendor, const char *name, const char *v)
         return efi_set_variable(vendor, name, u16, (char16_strlen(u16) + 1) * sizeof(char16_t));
 }
 
-int efi_systemd_options_variable(char **line) {
+int systemd_efi_options_variable(char **line) {
         const char *e;
         int r;
 

diff --git a/src/basic/efivars.h b/src/basic/efivars.h
index 22edbed98567bd7b8dea689011ca00fb5f0b493e..46ca58d0a52fd2dec3119f44fbd1b2a431fbe627 100644 (file)
--- a/src/basic/efivars.h
+++ b/src/basic/efivars.h
@@ -28,7 +28,7 @@ int efi_get_variable_string(sd_id128_t vendor, const char *name, char **p);
 int efi_set_variable(sd_id128_t vendor, const char *name, const void *value, size_t size);
 int efi_set_variable_string(sd_id128_t vendor, const char *name, const char *p);
 
-int efi_systemd_options_variable(char **line);
+int systemd_efi_options_variable(char **line);
 
 #else
 
@@ -52,7 +52,7 @@ static inline int efi_set_variable_string(sd_id128_t vendor, const char *name, c
         return -EOPNOTSUPP;
 }
 
-static inline int efi_systemd_options_variable(char **line) {
+static inline int systemd_efi_options_variable(char **line) {
         return -ENODATA;
 }
 

diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
index bb2be068bb9c20a8cbd4c67dd97887026ad7d6e0..d3d99d9a7f90228222eaa09de6b778a048b8a95c 100644 (file)
--- a/src/basic/proc-cmdline.c
+++ b/src/basic/proc-cmdline.c
@@ -119,7 +119,7 @@ int proc_cmdline_parse(proc_cmdline_parse_t parse_item, void *data, ProcCmdlineF
 
         /* We parse the EFI variable first, because later settings have higher priority. */
 
-        r = efi_systemd_options_variable(&line);
+        r = systemd_efi_options_variable(&line);
         if (r < 0 && r != -ENODATA)
                 log_debug_errno(r, "Failed to get SystemdOptions EFI variable, ignoring: %m");
 
@@ -250,7 +250,7 @@ int proc_cmdline_get_key(const char *key, ProcCmdlineFlags flags, char **ret_val
                 return r;
 
         line = mfree(line);
-        r = efi_systemd_options_variable(&line);
+        r = systemd_efi_options_variable(&line);
         if (r == -ENODATA)
                 return false; /* Not found */
         if (r < 0)

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 803b056a3e25464618c97ae635fe036fc17d18f0..f8845369eca33dcd087bf300df085144b85eda27 100644 (file)
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -1035,17 +1035,17 @@ static int help(int argc, char *argv[], void *userdata) {
         printf("%s  [OPTIONS...] COMMAND ...\n"
                "\n%sInstall/update/remove the systemd-boot EFI boot manager and list/select entries.%s\n"
                "\nBoot Loader Commands:\n"
-               "     status            Show status of installed systemd-boot and EFI variables\n"
-               "     install           Install systemd-boot to the ESP and EFI variables\n"
-               "     update            Update systemd-boot in the ESP and EFI variables\n"
-               "     remove            Remove systemd-boot from the ESP and EFI variables\n"
-               "     is-installed      Test whether systemd-boot is installed in the ESP\n"
-               "     random-seed       Initialize random seed in ESP and EFI variables\n"
-               "     system-options    Query or set system options string in EFI variable\n"
+               "  status              Show status of installed systemd-boot and EFI variables\n"
+               "  install             Install systemd-boot to the ESP and EFI variables\n"
+               "  update              Update systemd-boot in the ESP and EFI variables\n"
+               "  remove              Remove systemd-boot from the ESP and EFI variables\n"
+               "  is-installed        Test whether systemd-boot is installed in the ESP\n"
+               "  random-seed         Initialize random seed in ESP and EFI variables\n"
+               "  systemd-efi-options Query or set system options string in EFI variable\n"
                "\nBoot Loader Entries Commands:\n"
-               "     list              List boot loader entries\n"
-               "     set-default ID    Set default boot loader entry\n"
-               "     set-oneshot ID    Set default boot loader entry, for next boot only\n"
+               "  list                List boot loader entries\n"
+               "  set-default ID      Set default boot loader entry\n"
+               "  set-oneshot ID      Set default boot loader entry, for next boot only\n"
                "\nOptions:\n"
                "  -h --help            Show this help\n"
                "     --version         Print version\n"
@@ -1716,17 +1716,17 @@ static int verb_random_seed(int argc, char *argv[], void *userdata) {
         return 0;
 }
 
-static int verb_system_options(int argc, char *argv[], void *userdata) {
+static int verb_systemd_efi_options(int argc, char *argv[], void *userdata) {
         int r;
 
         if (argc == 1) {
                 _cleanup_free_ char *line = NULL;
 
-                r = efi_systemd_options_variable(&line);
+                r = systemd_efi_options_variable(&line);
                 if (r < 0)
                         return log_error_errno(r, "Failed to query SystemdOptions EFI variable: %m");
 
-                printf("SystemdOptions: %s\n", line);
+                puts(line);
 
         } else {
                 r = efi_set_variable_string(EFI_VENDOR_SYSTEMD, "SystemdOptions", argv[1]);
@@ -1739,17 +1739,17 @@ static int verb_system_options(int argc, char *argv[], void *userdata) {
 
 static int bootctl_main(int argc, char *argv[]) {
         static const Verb verbs[] = {
-                { "help",           VERB_ANY, VERB_ANY, 0,            help                },
-                { "status",         VERB_ANY, 1,        VERB_DEFAULT, verb_status         },
-                { "install",        VERB_ANY, 1,        0,            verb_install        },
-                { "update",         VERB_ANY, 1,        0,            verb_install        },
-                { "remove",         VERB_ANY, 1,        0,            verb_remove         },
-                { "is-installed",   VERB_ANY, 1,        0,            verb_is_installed   },
-                { "list",           VERB_ANY, 1,        0,            verb_list           },
-                { "set-default",    2,        2,        0,            verb_set_default    },
-                { "set-oneshot",    2,        2,        0,            verb_set_default    },
-                { "random-seed",    VERB_ANY, 1,        0,            verb_random_seed    },
-                { "system-options", VERB_ANY, 2,        0,            verb_system_options },
+                { "help",                VERB_ANY, VERB_ANY, 0,            help                     },
+                { "status",              VERB_ANY, 1,        VERB_DEFAULT, verb_status              },
+                { "install",             VERB_ANY, 1,        0,            verb_install             },
+                { "update",              VERB_ANY, 1,        0,            verb_install             },
+                { "remove",              VERB_ANY, 1,        0,            verb_remove              },
+                { "is-installed",        VERB_ANY, 1,        0,            verb_is_installed        },
+                { "list",                VERB_ANY, 1,        0,            verb_list                },
+                { "set-default",         2,        2,        0,            verb_set_default         },
+                { "set-oneshot",         2,        2,        0,            verb_set_default         },
+                { "random-seed",         VERB_ANY, 1,        0,            verb_random_seed         },
+                { "systemd-efi-options", VERB_ANY, 2,        0,            verb_systemd_efi_options },
                 {}
         };