summaryrefslogtreecommitdiff
path: root/man/machine-id.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-09-23 19:36:21 +0200
committerLennart Poettering <lennart@poettering.net>2015-09-29 21:55:51 +0200
commit4a9b1dd4ad38e54e6b7df99fe3366ceddd1fa572 (patch)
treee7425f56edc4e8f9a78200d033ba9decc2407f18 /man/machine-id.xml
parentc2fc2c2560f0ca0fab383753c065e45d76f465e5 (diff)
downloadsystemd-4a9b1dd4ad38e54e6b7df99fe3366ceddd1fa572.tar.gz
machine-id-commit: merge machine-id-commit functionality into machine-id-setup
And remove machine-id-commit as separate binary. There's really no point in keeping this separate, as the sources are pretty much identical, and have pretty identical interfaces. Let's unify this in one binary. Given that machine-id-commit was a private binary of systemd (shipped in /usr/lib/) removing the tool is not an API break. While we are at it, improve the documentation of the command substantially.
Diffstat (limited to 'man/machine-id.xml')
-rw-r--r--man/machine-id.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/man/machine-id.xml b/man/machine-id.xml
index 92d67a3869..8ce9c46ff1 100644
--- a/man/machine-id.xml
+++ b/man/machine-id.xml
@@ -63,7 +63,7 @@
<para>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 boot if it is found to be empty.</para>
+ runtime at early boot if it is found to be empty.</para>
<para>The machine ID does not change based on user configuration
or when hardware is replaced.</para>