diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-03-13 21:47:07 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-03-13 22:05:33 +0100 |
commit | 0729b8c55e0dfaf302af4c57546871d47a652048 (patch) | |
tree | 9f0e22627003b9c258884e37951a1163d714662f /nixos/modules/services | |
parent | 506be57540a245b575ad72623769d36b398cdde2 (diff) | |
download | nixlib-0729b8c55e0dfaf302af4c57546871d47a652048.tar nixlib-0729b8c55e0dfaf302af4c57546871d47a652048.tar.gz nixlib-0729b8c55e0dfaf302af4c57546871d47a652048.tar.bz2 nixlib-0729b8c55e0dfaf302af4c57546871d47a652048.tar.lz nixlib-0729b8c55e0dfaf302af4c57546871d47a652048.tar.xz nixlib-0729b8c55e0dfaf302af4c57546871d47a652048.tar.zst nixlib-0729b8c55e0dfaf302af4c57546871d47a652048.zip |
Revert Merge #82310: nixos/systemd: apply .link
...even when networkd is disabled This reverts commit ce78f3ac701017008aa7f1db387b871b7ae65e01, reversing changes made to dc34da0755b3c36469965659c0ee4a1337e81c05. I'm sorry; Hydra has been unable to evaluate, always returning > error: unexpected EOF reading a line and I've been unable to reproduce the problem locally. Bisecting pointed to this merge, but I still can't see what exactly was wrong.
Diffstat (limited to 'nixos/modules/services')
-rw-r--r-- | nixos/modules/services/networking/zerotierone.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix index cf39ed065a76..042c4d5adddd 100644 --- a/nixos/modules/services/networking/zerotierone.nix +++ b/nixos/modules/services/networking/zerotierone.nix @@ -69,14 +69,13 @@ in environment.systemPackages = [ cfg.package ]; # Prevent systemd from potentially changing the MAC address - systemd.network.links."50-zerotier" = { - matchConfig = { - OriginalName = "zt*"; - }; - linkConfig = { - AutoNegotiation = false; - MACAddressPolicy = "none"; - }; - }; + environment.etc."systemd/network/50-zerotier.link".text = '' + [Match] + OriginalName=zt* + + [Link] + AutoNegotiation=false + MACAddressPolicy=none + ''; }; } |