picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nspawn, NEWS: add missing "s" in --private-users-chown (#4438)

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-10-20 23:03:26 -04:00 committed by Evgeny Vereshchagin
parent d9b8ea5448
commit 24597ee0e6
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
NEWS
View file

@ -569,13 +569,13 @@ CHANGES WITH 230:
of the owners and the ACLs of all files and directories in a of the owners and the ACLs of all files and directories in a
container tree to match the UID/GID user namespacing range selected container tree to match the UID/GID user namespacing range selected
for the container invocation. This mode is enabled via the new for the container invocation. This mode is enabled via the new
--private-user-chown switch. It also gained support for automatically --private-users-chown switch. It also gained support for
choosing a free, previously unused UID/GID range when starting a automatically choosing a free, previously unused UID/GID range when
container, via the new --private-users=pick setting (which implies starting a container, via the new --private-users=pick setting (which
--private-user-chown). Together, these options for the first time implies --private-users-chown). Together, these options for the first
make user namespacing for nspawn containers fully automatic and thus time make user namespacing for nspawn containers fully automatic and
deployable. The systemd-nspawn@.service template unit file has been thus deployable. The systemd-nspawn@.service template unit file has
changed to use this functionality by default. been changed to use this functionality by default.
* systemd-nspawn gained a new --network-zone= switch, that allows * systemd-nspawn gained a new --network-zone= switch, that allows
creating ad-hoc virtual Ethernet links between multiple containers, creating ad-hoc virtual Ethernet links between multiple containers,

2
src/nspawn/nspawn.c
View file

@ -219,7 +219,7 @@ static void help(void) {
" -U --private-users=pick Run within user namespace, autoselect UID/GID range\n" " -U --private-users=pick Run within user namespace, autoselect UID/GID range\n"
" --private-users[=UIDBASE[:NUIDS]]\n" " --private-users[=UIDBASE[:NUIDS]]\n"
" Similar, but with user configured UID/GID range\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" " --private-network Disable network in container\n"
" --network-interface=INTERFACE\n" " --network-interface=INTERFACE\n"
" Assign an existing network interface to the\n" " Assign an existing network interface to the\n"