diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-04-11 17:27:11 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-04-11 17:27:11 +0200 |
| commit | 70a399c43a293cc4864c4e9421e265a64305cdc5 (patch) | |
| tree | 618510122546a7d40632415484563b41eed534ba /man/systemd-nspawn.xml | |
| parent | 2270dfb852eacd984fb49ce6bc83a38fe652a063 (diff) | |
| parent | e01ff70a77e781734e1e73a2238af2e9bf7967a8 (diff) | |
Merge pull request #3014 from msekletar/nspawn-empty-machine-id-v3
nspawn: always setup machine id (v3)
Diffstat (limited to 'man/systemd-nspawn.xml')
| -rw-r--r-- | man/systemd-nspawn.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 7e87865ba8..3f3bd38900 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -355,7 +355,9 @@ <listitem><para>Set the specified UUID for the container. The init system will initialize <filename>/etc/machine-id</filename> from this if this file is - not set yet. </para></listitem> + not set yet. Note that this option takes effect only if + <filename>/etc/machine-id</filename> in the container is + unpopulated.</para></listitem> </varlistentry> <varlistentry> |