diff --git a/Makefile.am b/Makefile.am
index 1e07ebae35..f3ad60ea91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -692,7 +692,8 @@ MANPAGES = \
man/modules-load.d.5 \
man/sysctl.d.5 \
man/systemd-ask-password.1 \
- man/systemd-cat.1
+ man/systemd-cat.1 \
+ man/systemd-machine-id-setup.1
MANPAGES_ALIAS = \
man/reboot.8 \
diff --git a/man/machine-id.xml b/man/machine-id.xml
index 6ca9990988..97c622c6fa 100644
--- a/man/machine-id.xml
+++ b/man/machine-id.xml
@@ -81,6 +81,11 @@
a more useful replacement for the
gethostid3
call POSIX specifies.
+
+ The
+ systemd-machine-id-setup1
+ tool may be used by installer tools to initialize the
+ machine ID at install time.
@@ -127,6 +132,7 @@ id[8] = (id[8] & 0x3F) | 0x80;
See Alsosystemd1,
+ systemd-machine-id-setup1,
gethostid3,
hostname5,
machine-info5,
diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml
index 41b3685378..5e5431f1b2 100644
--- a/man/systemd-cat.xml
+++ b/man/systemd-cat.xml
@@ -5,7 +5,7 @@
+
+
+
+
+
+
+
+ systemd-machine-id-setup
+ systemd
+
+
+
+ Developer
+ Lennart
+ Poettering
+ lennart@poettering.net
+
+
+
+
+
+ systemd-machine-id-setup
+ 1
+
+
+
+ systemd-machine-id-setup
+ Initialize the machine ID in /etc/machine-id
+
+
+
+
+ systemd-machine-id-setup
+
+
+
+
+ Description
+
+ systemd-machine-id-setup may
+ be used by system installer tools to initialize the
+ machine ID stored in
+ /etc/machine-id at install time
+ with a randomly generated ID. See
+ machine-id5
+ for more information about this file.
+
+ This tool will execute no operation if
+ /etc/machine-id is already
+ initialized.
+
+ If a valid D-Bus machine ID is already
+ configured for the system the D-Bus machine ID is
+ copied and used to initialize the machine ID in
+ /etc/machine-id.
+
+ If run inside a KVM virtual machine and a UUID
+ is passed via the option this
+ UUID is used to initialize the machine ID instead of a
+ randomly generated one. The caller must ensure that the
+ UUID passed is sufficiently unique and is different
+ for every booted instanced of the VM.
+
+ Similar, if run inside a Linux container
+ environment and a UUID is set for the container this
+ is used to initialize the machine ID. For details see
+ the documentation of the Container
+ Interface.
+
+
+
+
+ Options
+
+ This tool does not take any options or arguments.
+
+
+
+ Exit status
+
+ On success 0 is returned, a non-zero failure
+ code otherwise.
+
+
+
+ See Also
+
+ systemd1,
+ machine-id5,
+ dbus-uuidgen1
+
+
+
+