From 24bebfa3088ba597ee183b138faf5818e8de4122 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 3 Feb 2021 22:18:05 +0100 Subject: [PATCH] Revert "nixos/network-interfaces-systemd: fix IPv6 privacy extensions" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d349582c0769aa4b9c48e7921e5510072dd37c74. The workaround initially applied isn't necessary anymore, as 247.3 contains the following commit: > 242fc1d261 network: fix IPv6PrivacyExtensions=kernel handling … which fixes https://github.com/systemd/systemd/issues/18003. --- nixos/modules/tasks/network-interfaces-systemd.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 088bffd7c508..23e1e611a71e 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -93,17 +93,7 @@ in (if i.useDHCP != null then i.useDHCP else false)); address = forEach (interfaceIps i) (ip: "${ip.address}/${toString ip.prefixLength}"); - # IPv6PrivacyExtensions=kernel seems to be broken with networkd. - # Instead of using IPv6PrivacyExtensions=kernel, configure it according to the value of - # `tempAddress`: - networkConfig.IPv6PrivacyExtensions = { - # generate temporary addresses and use them by default - "default" = true; - # generate temporary addresses but keep using the standard EUI-64 ones by default - "enabled" = "prefer-public"; - # completely disable temporary addresses - "disabled" = false; - }.${i.tempAddress}; + networkConfig.IPv6PrivacyExtensions = "kernel"; linkConfig = optionalAttrs (i.macAddress != null) { MACAddress = i.macAddress; } // optionalAttrs (i.mtu != null) {