X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-nspawn.xml;h=b34d38c9b53638926654675739c714bf0ecff1de;hb=6bebb0add4d7c32c503e688105c1607e5e20f979;hp=665518dd15ed4adf76b603086bc675bfb072972d;hpb=ab046dde6f355f4a8b07ff6120a7ef51f5d49fc9;p=elogind.git diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 665518dd1..b34d38c9b 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -179,8 +179,8 @@ Turns off any status output by the tool itself. When this - switch is used, then the only output - by nspawn will be the console output + switch is used, the only output + from nspawn will be the console output of the container OS itself. @@ -272,7 +272,7 @@ and configured with . If - this option is specified the + this option is specified, the CAP_NET_ADMIN capability will be added to the set of capabilities the container retains. The latter may be @@ -289,7 +289,7 @@ specified interface from the calling namespace and place it in the container. When the container - terminates it is moved back to the + terminates, it is moved back to the host namespace. Note that implies @@ -303,14 +303,14 @@ Create a virtual - ethernet link between host and + Ethernet link between host and container. The host side of the - ethernet link will be available as + Ethernet link will be available as a network interface named after the container's name (as specified with ), prefixed with ve-. The - container side of the the ethernet + container side of the the Ethernet link will be named host0. Note that @@ -322,7 +322,7 @@ Adds the host side of the - ethernet link created with + Ethernet link created with to the specified bridge. Note that @@ -378,7 +378,7 @@ is retained if is specified. If the special value - all is passed all + all is passed, all capabilities are retained. @@ -524,7 +524,7 @@ and shown by tools such as ps1. If the container does not run an init - system it is recommended to set this + system, it is recommended to set this option to no. Note that implies @@ -540,13 +540,13 @@ container in, simply register the service or scope unit systemd-nspawn has - been invoked in in + been invoked in with systemd-machined8. This has no effect if is used. This switch should be used if systemd-nspawn is - invoked from within an a service unit, + invoked from within a service unit, and the service unit's sole purpose is to run a single systemd-nspawn