diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-09-28 08:40:41 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-10-09 22:05:36 +0200 |
| commit | 590ddb80cc1267ad5c411047a4e30f8a678d16bb (patch) | |
| tree | ef33eea1683d5230e3534869fb4d0225538315d3 /man | |
| parent | 3264af10dec4ef42adb2b903108b46324ce569d0 (diff) | |
all: rework configuring route table support by adding "route-table" setting
We added "ipv4.route-table-sync" and "ipv6.route-table-sync" to not change
behavior for users that configured policy routing outside of NetworkManager,
for example, via a dispatcher script. Users had to explicitly opt-in
for NetworkManager to fully manage all routing tables.
These settings were awkward. Replace them with new settings "ipv4.route-table"
and "ipv6.route-table". Note that this commit breaks API/ABI on the unstable
development branch by removing recently added API.
As before, a connection will have no route-table set by default. This
has the meaning that policy-routing is not enabled and only the main table
will be fully synced. Once the user sets a table, we recognize that and
NetworkManager manages all routing tables.
The new route-table setting has other important uses: analog to
"ipv4.route-metric", it is the default that applies to all routes.
Currently it only works for static routes, not DHCP, SLAAC,
default-route, etc. That will be implemented later.
For static routes, each route still can explicitly set a table, and
overwrite the per-connection setting in "ipv4.route-table" and
"ipv6.route-table".
Diffstat (limited to 'man')
| -rw-r--r-- | man/NetworkManager.conf.xml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 94465a019..611c7d079 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -684,8 +684,11 @@ ipv6.ip6-privacy=0 <term><varname>ipv4.route-metric</varname></term> </varlistentry> <varlistentry> - <term><varname>ipv4.route-table-sync</varname></term> - <listitem><para>If left unspecified, the default value is 2 (main).</para></listitem> + <term><varname>ipv4.route-table</varname></term> + <listitem><para>If left unspecified, routes are only added to the main table. Note that this + is different from explicitly selecting the main table 254, because of how NetworkManager + removes extraneous routes from the tables. + </para></listitem> </varlistentry> <varlistentry> <term><varname>ipv6.dhcp-timeout</varname></term> @@ -702,8 +705,11 @@ ipv6.ip6-privacy=0 <term><varname>ipv6.route-metric</varname></term> </varlistentry> <varlistentry> - <term><varname>ipv6.route-table-sync</varname></term> - <listitem><para>If left unspecified, the default value is 2 (main).</para></listitem> + <term><varname>ipv6.route-table</varname></term> + <listitem><para>If left unspecified, routes are only added to the main table. Note that this + is different from explicitly selecting the main table 254, because of how NetworkManager + removes extraneous routes from the tables. + </para></listitem> </varlistentry> <varlistentry> <term><varname>vpn.timeout</varname></term> |