summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-10-20 23:03:26 -0400
committerEvgeny Vereshchagin <evvers@ya.ru>2016-10-21 06:03:26 +0300
commit24597ee0e626b61f134e09b4e871449ef86b1343 (patch)
tree1875dbc5b0f2aae3da3ee60ffa3b76a4a736a588
parentd9b8ea5448ba1e61d681a206d770a4eac39b9936 (diff)
nspawn, NEWS: add missing "s" in --private-users-chown (#4438)
-rw-r--r--NEWS14
-rw-r--r--src/nspawn/nspawn.c2
2 files changed, 8 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index 4924d7c4b6..5467166567 100644
--- a/NEWS
+++ b/NEWS
@@ -569,13 +569,13 @@ CHANGES WITH 230:
of the owners and the ACLs of all files and directories in a
container tree to match the UID/GID user namespacing range selected
for the container invocation. This mode is enabled via the new
- --private-user-chown switch. It also gained support for automatically
- choosing a free, previously unused UID/GID range when starting a
- container, via the new --private-users=pick setting (which implies
- --private-user-chown). Together, these options for the first time
- make user namespacing for nspawn containers fully automatic and thus
- deployable. The systemd-nspawn@.service template unit file has been
- changed to use this functionality by default.
+ --private-users-chown switch. It also gained support for
+ automatically choosing a free, previously unused UID/GID range when
+ starting a container, via the new --private-users=pick setting (which
+ implies --private-users-chown). Together, these options for the first
+ time make user namespacing for nspawn containers fully automatic and
+ thus deployable. The systemd-nspawn@.service template unit file has
+ been changed to use this functionality by default.
* systemd-nspawn gained a new --network-zone= switch, that allows
creating ad-hoc virtual Ethernet links between multiple containers,
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 14af51fc0e..2cbe563953 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -219,7 +219,7 @@ static void help(void) {
" -U --private-users=pick Run within user namespace, autoselect UID/GID range\n"
" --private-users[=UIDBASE[:NUIDS]]\n"
" Similar, but with user configured UID/GID range\n"
- " --private-user-chown Adjust OS tree ownership to private UID/GID range\n"
+ " --private-users-chown Adjust OS tree ownership to private UID/GID range\n"
" --private-network Disable network in container\n"
" --network-interface=INTERFACE\n"
" Assign an existing network interface to the\n"