shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

bootctl: deprecate --make-machine-id-directory=auto

Browse Source 
Now that kernel-install creates the machine-id directory, we don't need to do
this is 'bootctl install', and in fact it's better not to do this since it
might never be necessary. So let's change the default behaviour to 'no'.

I kept support for 'auto' to maintain backwards compatibility, even though the
default was changed. Previous behaviour can be requested by specifying
--make-machine-id-directory=auto.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-12-17 18:37:08 +01:00
parent 47fb161e3a
commit 1ff493d5c1
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
man/bootctl.xml
View File

@ -258,14 +258,11 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>--make-machine-id-directory=yes|no|auto</option></term> <term><option>--make-machine-id-directory=yes|no</option></term>
<listitem><para>Control creation and deletion of the top-level machine ID directory on the file <listitem><para>Control creation and deletion of the top-level machine ID directory on the file
system containing boot loader entries (i.e. beneath the file system returned by the system containing boot loader entries (i.e. beneath the file system returned by the
<option>--print-boot-path</option> option, see above) during <option>install</option> and <option>--print-boot-path</option> option, see above) during <option>install</option> and
<option>remove</option>, respectively. <literal>auto</literal> is equivalent to <option>remove</option>, respectively. Defaults to <literal>no</literal>. See
<literal>yes</literal> if <filename>/etc/machine-id</filename> resides on a filesystem other than
tmpfs and <literal>no</literal> otherwise (in the latter case the machine ID is likely transient and
hence should not be used persistently in the ESP). Defaults to <literal>auto</literal>. See
<citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry> for <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry> for
details about the machine ID concept and file.</para> details about the machine ID concept and file.</para>

6
src/boot/bootctl.c
View File

@ -55,7 +55,7 @@ static bool arg_print_dollar_boot_path = false;
static bool arg_touch_variables = true; static bool arg_touch_variables = true;
static PagerFlags arg_pager_flags = 0; static PagerFlags arg_pager_flags = 0;
static bool arg_graceful = false; static bool arg_graceful = false;
static int arg_make_machine_id_directory = -1; static int arg_make_machine_id_directory = 0;
static sd_id128_t arg_machine_id = SD_ID128_NULL; static sd_id128_t arg_machine_id = SD_ID128_NULL;
static char *arg_install_layout = NULL; static char *arg_install_layout = NULL;
@ -1347,8 +1347,8 @@ static int parse_argv(int argc, char *argv[]) {
break; break;
case ARG_MAKE_MACHINE_ID_DIRECTORY: case ARG_MAKE_MACHINE_ID_DIRECTORY:
if (streq(optarg, "auto")) if (streq(optarg, "auto")) /* retained for backwards compatibility */
arg_make_machine_id_directory = -1; /* default */ arg_make_machine_id_directory = -1; /* yes if machine-id is permanent */
else { else {
r = parse_boolean_argument("--make-machine-id-directory=", optarg, &b); r = parse_boolean_argument("--make-machine-id-directory=", optarg, &b);
if (r < 0) if (r < 0)