summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-12-14 22:47:57 +0100
committerGitHub <noreply@github.com>2017-12-14 22:47:57 +0100
commitbdd2bbc4450e0d7515b556c04828dc69ef0b5c09 (patch)
tree833c553373084e0a90f7cd5a324c6b34ef559177 /man
parent6c9c81fce1bbfe644ba8b12f44b7675e88282c87 (diff)
parentf3d33947eaf9f88f3113e1e07eafcbbc7626b7c4 (diff)
downloadsystemd-bdd2bbc4450e0d7515b556c04828dc69ef0b5c09.tar.gz
systemd-bdd2bbc4450e0d7515b556c04828dc69ef0b5c09.tar.bz2
systemd-bdd2bbc4450e0d7515b556c04828dc69ef0b5c09.zip
Merge pull request #7469 from kinvolk/dongsu/nspawn-netns
nspawn: introduce an option for specifying network namespace path
Diffstat (limited to 'man')
-rw-r--r--man/systemd-nspawn.xml17
1 files changed, 17 insertions, 0 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index cd45ceb2a1..3dbdf376d3 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -523,6 +523,23 @@
</varlistentry>
<varlistentry>
+ <term><option>--network-namespace-path=</option></term>
+
+ <listitem><para>Takes the path to a file representing a kernel
+ network namespace that the container shall run in. The specified path
+ should refer to a (possibly bind-mounted) network namespace file, as
+ exposed by the kernel below <filename>/proc/$PID/ns/net</filename>.
+ This makes the container enter the given network namespace. One of the
+ typical use cases is to give a network namespace under
+ <filename>/run/netns</filename> created by <citerefentry
+ project='man-pages'><refentrytitle>ip-netns</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+ for example, <option>--network-namespace-path=/run/netns/foo</option>.
+ Note that this option cannot be used together with other
+ network-related options, such as <option>--private-network</option>
+ or <option>--network-interface=</option>.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><option>--network-interface=</option></term>
<listitem><para>Assign the specified network interface to the