system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 10:17:21 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

man: minor fixes to networkd page

Browse source 
Also enforce that we don't allow setting the Broadcast for IPv6 addresses.
This commit is contained in:
Tom Gundersen 2014-02-18 15:48:30 +01:00
parent 7e95eda5b3
commit 482e2ac193
2 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
man/systemd-networkd.service.xml
View file

@ -61,11 +61,16 @@
network devices as they appear, as well as creating virtual
network devices.</para>
<para>To configure low-level link settings independently of
networks, see
<citerefentry><refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum></citerefentry>
.</para>
<para>Network configurations applied before networkd is started
are not removed, and configuration applied by networkd are not
removed when networkd exits. This ensures restarting networkd
does not cut the network connection, and, in particular, that
it is safe to transition between the initrd and the real root,
are not removed, and static configuration applied by networkd
are not removed when networkd exits. This ensures restarting
networkd does not cut the network connection, and, in particular,
that it is safe to transition between the initrd and the real root,
and back.</para>
</refsect1>
@ -105,14 +110,15 @@
<varlistentry>
<term><varname>Kind</varname></term>
<listitem>
<para>The netdev kind. Currently, <literal>bridge</literal>, <literal>bond</literal> and <literal>vlan</literal>
<para>The netdev kind. Currently, <literal>bridge</literal>,
<literal>bond</literal> and <literal>vlan</literal>
are supported. This option is compulsory.</para>
</listitem>
</varlistentry>
</variablelist>
<para>The <literal>[VLAN]</literal> section only applies for netdevs of kind <literal>vlan</literal>,
and accepts the following keys:</para>
and accepts the following key:</para>
<variablelist class='network-directives'>
<varlistentry>
@ -251,6 +257,15 @@
<para>As in the <literal>[Network]</literal> section. This key is mandatory.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>Broadcast</varname></term>
<listitem>
<para>The broadcast address, which must be in the format described in
<citerefentry><refentrytitle>inet_pton</refentrytitle><manvolnum>3</manvolnum></citerefentry>
. This key only applies to IPv4 addresses. If it is not given, it is
derived from the <literal>Address</literal> key.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>Label</varname></term>
<listitem>

7
src/network/networkd-address.c
View file

@ -275,6 +275,13 @@ int config_parse_broadcast(const char *unit,
if (r < 0)
return r;
if (n->family == AF_INET6) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Broadcast is not valid for IPv6 addresses, "
"ignoring assignment: %s", address);
return 0;
}
r = net_parse_inaddr(address, &n->family, &n->broadcast);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,