summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-06-03 01:02:51 +0200
committerTom Gundersen <teg@jklm.no>2015-06-03 01:02:51 +0200
commitcfe907ab6eba7c304451f9588cc3b484fe72fe52 (patch)
tree922f91d14ade693c5c178bd2e38485ad0713aac7 /man
parent495968cf4e50b0380478833747c4279e19a33856 (diff)
parent3ed7e9c735219456a9b6561f9ece617fec1a7aa1 (diff)
Merge pull request #41 from mischief/ipforwarding
networkd: create "kernel" setting for IPForwarding
Diffstat (limited to 'man')
-rw-r--r--man/systemd.network.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index bd061c270a..54fef4c9c4 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -366,7 +366,8 @@
the routing table. Takes either a boolean argument, or the
values <literal>ipv4</literal> or <literal>ipv6</literal>,
which only enables IP forwarding for the specified address
- family. This controls the
+ family, or <literal>kernel</literal>, which preserves existing sysctl settings.
+ This controls the
<filename>net.ipv4.conf.&lt;interface&gt;.forwarding</filename>
and
<filename>net.ipv6.conf.&lt;interface&gt;.forwarding</filename>
@@ -375,8 +376,8 @@
for details about sysctl options). Defaults to
<literal>no</literal>.</para>
- <para>Note: unless this option is turned on, no IP
- forwarding is done on this interface, even if this is
+ <para>Note: unless this option is turned on, or set to <literal>kernel</literal>,
+ no IP forwarding is done on this interface, even if this is
globally turned on in the kernel, with the
<filename>net.ipv4.ip_forward</filename> and
<filename>net.ipv4.ip_forward</filename> sysctl