diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-06-12 12:28:16 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-06-12 12:28:16 +0200 |
| commit | 533b4329404ef34081bf0cb4fcdef2aeda4a8820 (patch) | |
| tree | 18e84bfda8b412845727d5b66779df5d31fb94d1 /man | |
| parent | 4ff7d7e90ccc47e1e7e1f99bbeaae669d04ce782 (diff) | |
| parent | 2972cba11712c3bfbe9fa07d1f3c3c4330127733 (diff) | |
Merge pull request #173 from mischief/ipforwarding-3
IPForwarding=kernel v3
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd.network.xml | 7 |
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.<interface>.forwarding</filename> and <filename>net.ipv6.conf.<interface>.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 |