mirror of
https://github.com/systemd/systemd
synced 2024-09-06 08:46:19 +00:00
Merge pull request #29314 from YHNdnzj/firstboot-fixup
Small fixups for first boot
This commit is contained in:
commit
e1e0c4f025
|
@ -37,7 +37,7 @@
|
|||
<para><command>systemd-firstboot</command> initializes basic system settings interactively during the
|
||||
first boot, or non-interactively on an offline system image. The service is started during boot if
|
||||
<varname>ConditionFirstBoot=yes</varname> is met, which essentially means that <filename>/etc/</filename>
|
||||
is empty, see
|
||||
is unpopulated, see
|
||||
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry> for
|
||||
details.</para>
|
||||
|
||||
|
|
|
@ -2151,7 +2151,7 @@ static void log_execution_mode(bool *ret_first_boot) {
|
|||
r = read_one_line_file("/etc/machine-id", &id_text);
|
||||
if (r < 0 || streq(id_text, "uninitialized")) {
|
||||
if (r < 0 && r != -ENOENT)
|
||||
log_warning_errno(r, "Unexpected error while reading /etc/machine-id, ignoring: %m");
|
||||
log_warning_errno(r, "Unexpected error while reading /etc/machine-id, assuming first boot: %m");
|
||||
|
||||
first_boot = true;
|
||||
log_info("Detected first boot.");
|
||||
|
|
Loading…
Reference in a new issue