diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2023-10-14 14:48:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-14 14:48:22 +0200 |
| commit | 6998695f5d916ee659351391daffc00221ab791d (patch) | |
| tree | 26b52b2ce52704443258007203d96ad366a00cf6 /nixos/modules/tasks | |
| parent | 09246068b150e4e39122f0118cbcb91bd4c8e964 (diff) | |
| parent | f5f1751b1ffcd936fc5964c3075943ee39621cf2 (diff) | |
Merge pull request #259658 from Majiir/fix-networkd-wakeonlan
nixos/network-interfaces-systemd: fix WakeOnLan
Diffstat (limited to 'nixos/modules/tasks')
| -rw-r--r-- | nixos/modules/tasks/network-interfaces-scripted.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/tasks/network-interfaces.nix | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 67ef152c4b65d..da4aa916d655e 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -61,8 +61,6 @@ let MACAddress = i.macAddress; } // optionalAttrs (i.mtu != null) { MTUBytes = toString i.mtu; - } // optionalAttrs (i.wakeOnLan.enable == true) { - WakeOnLan = concatStringsSep " " i.wakeOnLan.policy; }; }; in listToAttrs (map createNetworkLink interfaces); diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 4900b77de3746..eda036cb726be 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1463,6 +1463,16 @@ in ] ++ bridgeStp; + # Wake-on-LAN configuration is shared by the scripted and networkd backends. + systemd.network.links = pipe interfaces [ + (filter (i: i.wakeOnLan.enable)) + (map (i: nameValuePair "40-${i.name}" { + matchConfig.OriginalName = i.name; + linkConfig.WakeOnLan = concatStringsSep " " i.wakeOnLan.policy; + })) + listToAttrs + ]; + # The network-interfaces target is kept for backwards compatibility. # New modules must NOT use it. systemd.targets.network-interfaces = |