From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 9 Aug 2023 11:08:58 +0000 (+0200)
Subject: bootctl: don't advertise systemd-efi-options in --help/man anymore
X-Git-Tag: v255-rc1~783
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0de0ed6e89823c8834a94682bfd5e366aee9930b;p=thirdparty%2Fsystemd.git

bootctl: don't advertise systemd-efi-options in --help/man anymore

The command is deprecated, as per NEWS of 254. Let's go one step further
and remove it from the help text and man page, so that people are not
inspired to use it at this time anymore.

This is how we usually have done this before: remove it from visibility,
but support it for a while still.
---

diff --git a/man/bootctl.xml b/man/bootctl.xml
index a03c7c76e81..7bdada8a880 100644
--- a/man/bootctl.xml
+++ b/man/bootctl.xml
@@ -69,19 +69,6 @@
         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
         for details.</para></listitem>
       </varlistentry>
-
-      <varlistentry>
-        <term><option>systemd-efi-options</option> <optional><replaceable>STRING</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 variable to
-        that value. See
-        <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry> for the
-        meaning of that variable.</para>
-
-        <para>Note: use of <literal>SystemdOptions</literal> and this command is deprecated.</para>
-        </listitem>
-      </varlistentry>
     </variablelist>
   </refsect1>
 
diff --git a/src/boot/bootctl-systemd-efi-options.c b/src/boot/bootctl-systemd-efi-options.c
index 6375f210970..7f8308fc3d6 100644
--- a/src/boot/bootctl-systemd-efi-options.c
+++ b/src/boot/bootctl-systemd-efi-options.c
@@ -8,6 +8,8 @@
 int verb_systemd_efi_options(int argc, char *argv[], void *userdata) {
         int r;
 
+        /* This is obsolete and subject to removal */
+
         if (!arg_quiet)
                 log_notice("Use of the SystemdOptions EFI variable is deprecated.");
 
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index a86ab84d190..1bc4aaf3bab 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -142,8 +142,6 @@ static int help(int argc, char *argv[], void *userdata) {
                "  status               Show status of installed boot loader and EFI variables\n"
                "  reboot-to-firmware [BOOL]\n"
                "                       Query or set reboot-to-firmware EFI flag\n"
-               "  systemd-efi-options [STRING]\n"
-               "                       Query or set system options string in EFI variable\n"
                "\n%3$sBoot Loader Specification Commands:%4$s\n"
                "  list                 List boot loader entries\n"
                "  unlink ID            Remove boot loader entry\n"