diff options
author | lassulus <lassulus@lassul.us> | 2021-12-08 08:15:51 +0100 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2021-12-08 08:15:51 +0100 |
commit | 0f3c4547f9e0d3c4fc9bd32c056aa76e9e2277f1 (patch) | |
tree | dabde376b4add8e53d2a3e0cc12de14b9326731d /tv/2configs/default.nix | |
parent | f221b9cc16e23a03b20f1727918f6122eb1e57f8 (diff) | |
parent | a05213de2a259d2a1e328876827ef25f0fb7f7b3 (diff) |
Merge remote-tracking branch 'ni/master' into 21.11
Diffstat (limited to 'tv/2configs/default.nix')
-rw-r--r-- | tv/2configs/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index de298e162..8add07ff6 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -94,8 +94,17 @@ with import <stockholm/lib>; { boot.kernel.sysctl = { # Enable IPv6 Privacy Extensions - "net.ipv6.conf.all.use_tempaddr" = 2; - "net.ipv6.conf.default.use_tempaddr" = 2; + # + # XXX use mkForce here because since NixOS 21.11 there's a collision in + # net.ipv6.conf.default.use_tempaddr, and boot.kernel.sysctl incapable + # of merging. + # + # XXX net.ipv6.conf.all.use_tempaddr is set because it was mentioned in + # https://tldp.org/HOWTO/Linux+IPv6-HOWTO/ch06s05.html + # TODO check if that is really necessary, otherwise we can rely solely + # on networking.tempAddresses in the future (when nothing is <21.11) + "net.ipv6.conf.all.use_tempaddr" = mkForce 2; + "net.ipv6.conf.default.use_tempaddr" = mkForce 2; }; } |