picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

man: describe IPv6AcceptRouterAdvertisements= better

Browse source 
With the previous description it wasn't clear that the
kernel default is being described.

Add link to kernel docs.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-09-30 14:59:43 -04:00
parent 7e3ce75d34
commit ebf9808112
2 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
man/systemd.network.xml
View file

@ -409,11 +409,21 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>IPv6AcceptRouterAdvertisements=</varname></term> <term><varname>IPv6AcceptRouterAdvertisements=</varname></term>
<listitem><para>Configures Accept Router Advertisements. <listitem><para>Force the setting of <filename>accept_ra</filename>
This is enabled if local forwarding is disabled. (router advertisements) setting for the interface.
Disabled if local forwarding is enabled. When unset, the kernel default is used, and router
Takes a boolean. Defaults to unset. advertisements are accepted only when local forwarding
</para></listitem> is disabled for that interface.
Takes a boolean. If true, router advertisements are
accepted, when false, router advertisements are ignored,
independently of the local forwarding state.</para>
<para>See
<ulink url="https://www.kernel.org/doc/Documentation/networking/ip-sysctl.txt">ip-sysctl.txt</ulink>
in the kernel documentation, but note that systemd's
setting of <constant>1</constant> corresponds to
kernel's setting of <constant>2</constant>.</para>
</listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>Bridge=</varname></term> <term><varname>Bridge=</varname></term>

8
src/network/networkd-link.c
View file

@ -1812,16 +1812,16 @@ static int link_set_ipv6_accept_ra(Link *link) {
* disabled if local forwarding is enabled). * disabled if local forwarding is enabled).
* If set, ignore or enforce RA independent of local forwarding state. * If set, ignore or enforce RA independent of local forwarding state.
*/ */
if (link->network->ipv6_accept_ra < 0) { if (link->network->ipv6_accept_ra < 0)
/* default to accept RA if ip_forward is disabled and ignore RA if ip_forward is enabled */ /* default to accept RA if ip_forward is disabled and ignore RA if ip_forward is enabled */
v = "1"; v = "1";
} else if (link->network->ipv6_accept_ra > 0) { else if (link->network->ipv6_accept_ra > 0)
/* "2" means accept RA even if ip_forward is enabled */ /* "2" means accept RA even if ip_forward is enabled */
v = "2"; v = "2";
} else { else
/* "0" means ignore RA */ /* "0" means ignore RA */
v = "0"; v = "0";
}
p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/accept_ra"); p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/accept_ra");
r = write_string_file(p, v, 0); r = write_string_file(p, v, 0);