summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-06-08 23:24:32 +0200
committerLennart Poettering <lennart@poettering.net>2015-06-08 23:24:32 +0200
commitee0eb1d891eb0a41fb63368bff264f59cb2bb851 (patch)
tree72cd0535aac68878929c3121e79153f300fd4ba2 /man
parent3edf03546d707369ce4ab62968640a6f01bc8972 (diff)
Revert "networkd: create "kernel" setting for IPForwarding"
Diffstat (limited to 'man')
-rw-r--r--man/systemd.network.xml7
1 files changed, 3 insertions, 4 deletions
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 54fef4c9c4..bd061c270a 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -366,8 +366,7 @@
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, or <literal>kernel</literal>, which preserves existing sysctl settings.
- This controls the
+ family. This controls the
<filename>net.ipv4.conf.&lt;interface&gt;.forwarding</filename>
and
<filename>net.ipv6.conf.&lt;interface&gt;.forwarding</filename>
@@ -376,8 +375,8 @@
for details about sysctl options). Defaults to
<literal>no</literal>.</para>
- <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
+ <para>Note: unless this option is turned on, 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