diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-04-22 14:10:09 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-04-25 12:16:02 +0200 |
| commit | ccabee0d6465f06b9d339cf449fd8eea0db13373 (patch) | |
| tree | d9742d9281a08fa46d9840619ba21a4746a0b30a /man | |
| parent | d2e5535f9d945db3ca20ed264e1fe1ce99707bba (diff) | |
nspawn: make -U a tiny bit smarter
With this change -U will turn on user namespacing only if the kernel actually
supports it and otherwise gracefully degrade to non-userns mode.
Diffstat (limited to 'man')
| -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 ea0c6562f8..bd688a0ee1 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -444,7 +444,9 @@ <varlistentry> <term><option>-U</option></term> - <listitem><para>Equivalent to <option>--private-users=pick</option>.</para></listitem> + <listitem><para>If the kernel supports the user namespaces feature, equivalent to + <option>--private-users=pick</option>, otherwise equivalent to + <option>--private-users=no</option>.</para></listitem> </varlistentry> <varlistentry> |