diff options
| author | Florian Klink <flokli@flokli.de> | 2020-04-23 10:36:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-23 10:36:57 +0200 |
| commit | 04e308a49653dc07978c2bfbc050766d17a1c1ab (patch) | |
| tree | ee7ee4117c91030e1bcc695c933d725f0331c5e8 /nixos | |
| parent | d0b9212338b18b3c70b30b8cef8ae7736eafa6c5 (diff) | |
| parent | f332109ebf67951b412457fee023222c4ed5f561 (diff) | |
Merge pull request #85815 from arianvp/fix-85800
Fix networkd not restarting on unit changes
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/monitoring/datadog-agent.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/networkd.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index 2c5fe47242e76..f1cb890794e15 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -225,7 +225,7 @@ in { Restart = "always"; RestartSec = 2; }; - restartTriggers = [ datadogPkg ] ++ attrNames etcfiles; + restartTriggers = [ datadogPkg ] ++ map (x: x.source) (attrValues etcfiles); } attrs; in { datadog-agent = makeService { diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 3078f84f6e920..a7580fb199787 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1073,7 +1073,7 @@ in systemd.services.systemd-networkd = { wantedBy = [ "multi-user.target" ]; - restartTriggers = attrNames unitFiles; + restartTriggers = map (x: x.source) (attrValues unitFiles); # prevent race condition with interface renaming (#39069) requires = [ "systemd-udev-settle.service" ]; after = [ "systemd-udev-settle.service" ]; |