summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2019-05-11 13:48:48 +0200
committerAndreas Rammhold <andreas@rammhold.de>2019-06-03 15:05:17 +0200
commit1b7b1dbe2f88a3c8f0c5416d4e43de10977915cc (patch)
tree6e84deb79038508fbdac62057eb0c4595c66e7e8
parentd600da70457a8ca8d9543eb48b73e7c5eae1656f (diff)
nixos/networkd: rename GatewayOnlink to GatewayOnLink
This follows upstreams renaming of the option [1]. [1] https://github.com/systemd/systemd/commit/9cb8c5593443d24c19e40bfd4fc06d672f8c554c
-rw-r--r--nixos/doc/manual/release-notes/rl-1909.xml10
-rw-r--r--nixos/modules/system/boot/networkd.nix2
-rw-r--r--nixos/modules/tasks/network-interfaces-systemd.nix2
3 files changed, 12 insertions, 2 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index 60b4a3bc17b6..bac642fa539f 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -104,6 +104,16 @@
</link>
</para>
</listitem>
+ <listitem>
+ <para>
+ The option <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnlink</option>
+ was renamed to <option>systemd.network.networks.&lt;name&gt;.routes.*.routeConfig.GatewayOnLink</option>
+ (capital <literal>L</literal>). This follows
+ <link xlink:href="https://github.com/systemd/systemd/commit/9cb8c5593443d24c19e40bfd4fc06d672f8c554c">
+ upstreams renaming
+ </link> of the setting.
+ </para>
+ </listitem>
</itemizedlist>
</section>
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 63a6f7fbe099..14a3832b0dc0 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -203,7 +203,7 @@ let
checkRoute = checkUnitConfig "Route" [
(assertOnlyFields [
- "Gateway" "GatewayOnlink" "Destination" "Source" "Metric"
+ "Gateway" "GatewayOnLink" "Destination" "Source" "Metric"
"IPv6Preference" "Scope" "PreferredSource" "Table" "Protocol" "Type"
"InitialCongestionWindow" "InitialAdvertisedReceiveWindow" "QuickAck"
"MTUBytes"
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index b9c1387cea5a..857aaf1e6e30 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -63,7 +63,7 @@ in
{
routeConfig = {
Gateway = gateway;
- GatewayOnlink = false;
+ GatewayOnLink = false;
};
}
];