summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-02-10 18:41:54 +0100
committerTom Gundersen <teg@jklm.no>2014-02-10 19:00:17 +0100
commit672682a6b9d6fb6a3722c3fea1a93b4831747b54 (patch)
tree8d7956ff4c9171faad0702afe01b9ac2656d3322 /man
parent3831838ae7b3ac145711bb84a71cb86cdd829975 (diff)
networkd: VLAN - allow multiple vlans to be created on a link
Also limit the range of vlan ids. Other implementations and documentation use the ranges {0,1}-{4094,4095}, but we use the one accepted by the kernel: 0-4094. Reported-by: Oleksii Shevchuk <alxchk@gmail.com>
Diffstat (limited to 'man')
-rw-r--r--man/systemd-networkd.service.xml14
1 files changed, 11 insertions, 3 deletions
diff --git a/man/systemd-networkd.service.xml b/man/systemd-networkd.service.xml
index e5499d66d7..1b1ea4c5fe 100644
--- a/man/systemd-networkd.service.xml
+++ b/man/systemd-networkd.service.xml
@@ -118,7 +118,8 @@
<varlistentry>
<term><varname>Id</varname></term>
<listitem>
- <para>The VLAN ID to use. This option is compulsory.</para>
+ <para>The VLAN ID to use. An integer in the range 0-4094.
+ This option is compulsory.</para>
</listitem>
</varlistentry>
</variablelist>
@@ -223,13 +224,20 @@
<varlistentry>
<term><varname>Bridge</varname></term>
<listitem>
- <para>The name of the bridge to add the configured link to.</para>
+ <para>The name of the bridge to add the link to.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>Bond</varname></term>
<listitem>
- <para>The name of the bond to add the configured link to.</para>
+ <para>The name of the bond to add the link to.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><varname>VLAN</varname></term>
+ <listitem>
+ <para>The name of a VLAN to create on the link. This option
+ may be specified more than once.</para>
</listitem>
</varlistentry>
</variablelist>