X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fmachine-id.xml;h=725370d32dc4e523af18aad4c770754181bec20c;hb=23bbb0de4e3f85d9704a5c12a5afa2dfa0159e41;hp=d7a56cb54860f37b023dbf48dbec635d8d0fc6f3;hpb=e9dd9f9547350c7dc0473583b5c2228dc8f0ab76;p=elogind.git
diff --git a/man/machine-id.xml b/man/machine-id.xml
index d7a56cb54..725370d32 100644
--- a/man/machine-id.xml
+++ b/man/machine-id.xml
@@ -65,7 +65,7 @@
The machine ID is usually generated from a
random source during system installation and stays
constant for all subsequent boots. Optionally, for
- stateless systems it is generated during runtime at
+ stateless systems, it is generated during runtime at
boot if it is found to be empty.
The machine ID does not change based on user
@@ -85,7 +85,10 @@
The
systemd-machine-id-setup1
tool may be used by installer tools to initialize the
- machine ID at install time.
+ machine ID at install time. Use
+ systemd-firstboot1
+ to initialize it on mounted (but not booted) system
+ images.
@@ -93,7 +96,7 @@
Note that the machine ID historically is not an
OSF UUID as defined by RFC
+ url="https://tools.ietf.org/html/rfc4122">RFC
4122, nor a Microsoft GUID; however, starting with
systemd v30, newly generated machine IDs do
qualify as v4 UUIDs.
@@ -113,7 +116,7 @@ id[8] = (id[8] & 0x3F) | 0x80;
(This code is inspired by
generate_random_uuid() of
drivers/char/random.c from the
- kernel sources.)
+ Linux kernel sources.)
@@ -123,7 +126,7 @@ id[8] = (id[8] & 0x3F) | 0x80;
The simple configuration file format of
/etc/machine-id originates in the
/var/lib/dbus/machine-id file
- introduced by D-Bus. In fact this latter file might be a
+ introduced by D-Bus. In fact, this latter file might be a
symlink to
/etc/machine-id.
@@ -138,7 +141,8 @@ id[8] = (id[8] & 0x3F) | 0x80;
machine-info5,
os-release5,
sd-id1283,
- sd_id128_get_machine3
+ sd_id128_get_machine3,
+ systemd-firstboot1