aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-07-01 21:49:28 +0200
committerTom Gundersen <teg@jklm.no>2014-07-01 21:49:53 +0200
commit0a8a0fad010018be0f46d1c2e077ade0eb27c7db (patch)
tree2201dbb6fc93e52fafb8bb0768b20a7598ab9613
parentman: bring systemd.netdev(5) up-to-date (diff)
downloadsystemd-0a8a0fad010018be0f46d1c2e077ade0eb27c7db.tar.gz
systemd-0a8a0fad010018be0f46d1c2e077ade0eb27c7db.tar.bz2
systemd-0a8a0fad010018be0f46d1c2e077ade0eb27c7db.zip
man: bring systemd.network(5) up-to-date
Based on diff by 'poma'.
-rw-r--r--man/systemd.network.xml62
1 files changed, 62 insertions, 0 deletions
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index f80212944..707ced13d 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -201,6 +201,14 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term><varname>DHCPServer=</varname></term>
+ <listitem>
+ <para>A boolean. Enables a basic DHCPv4 server on the
+ device. Mostly useful for handing out leases to container
+ instances.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><varname>IPv4LL=</varname></term>
<listitem>
<para>A boolean. When true, enables IPv4 link-local support.
@@ -278,6 +286,7 @@
This option may be specified more than once.</para>
</listitem>
</varlistentry>
+<!-- TODO: document NTP= option when it is actually used somewhere -->
<varlistentry>
<term><varname>Bridge=</varname></term>
<listitem>
@@ -304,6 +313,20 @@
may be specified more than once.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><varname>VXLAN=</varname></term>
+ <listitem>
+ <para>The name of a VXLAN to create on the link. This option
+ may be specified more than once.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><varname>Tunnel=</varname></term>
+ <listitem>
+ <para>The name of a Tunnel to create on the link. This option
+ may be specified more than once.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>
@@ -451,6 +474,45 @@ Name=enp2s0
[Network]
Bridge=bridge0</programlisting>
</example>
+ <example>
+ <title>/etc/systemd/network/ipip.network</title>
+
+ <programlisting>[Match]
+Name=em1
+
+[Network]
+Tunnel=ipip-tun</programlisting>
+ </example>
+
+ <example>
+ <title>/etc/systemd/network/sit.network</title>
+
+ <programlisting>[Match]
+Name=em1
+
+[Network]
+Tunnel=sit-tun</programlisting>
+ </example>
+
+ <example>
+ <title>/etc/systemd/network/gre.network</title>
+
+ <programlisting>[Match]
+Name=em1
+
+[Network]
+Tunnel=gre-tun</programlisting>
+ </example>
+
+ <example>
+ <title>/etc/systemd/network/vti.network</title>
+
+ <programlisting>[Match]
+Name=em1
+
+[Network]
+Tunnel=vti-tun</programlisting>
+ </example>
</refsect1>
<refsect1>