diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml index 8ece65eacc..bb53cc7069 100644 --- a/man/systemd-machine-id-setup.xml +++ b/man/systemd-machine-id-setup.xml @@ -43,24 +43,31 @@ ID will be acquired in the following fashion: - 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 a valid machine ID is stored in /run/machine-id, the machine ID + is copied and used to initialize the machine ID in /etc/machine-id. This step is + skipped if is specified or running in a chroot environment. - If run inside a KVM virtual machine and a UUID - is configured (via the - option), this UUID is used to initialize the machine ID. The - caller must ensure that the UUID passed is sufficiently unique - and is different for every booted instance of the - VM. + 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 a valid machine ID is provided through credential, + the machine ID is copied and used to initialize the machine ID in /etc/machine-id. + This step is skipped if is specified or running in a chroot environment. + + + If run inside a KVM virtual machine and a UUID is configured (via the + option), this UUID is used to initialize the machine ID. The caller must ensure + that the UUID passed is sufficiently unique and is different for every booted instance of the VM. This + step is skipped if is specified or running in a chroot environment. + Similarly, if run inside a Linux container environment and a UUID is configured for the container, this is used to initialize the machine ID. For details, see the documentation of the Container Interface. + url="https://systemd.io/CONTAINER_INTERFACE">Container Interface. This step is skipped if + is specified or running in a chroot environment. - Otherwise, a new ID is randomly - generated. + Otherwise, a new ID is randomly generated. The switch may be used to commit a