public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #85815 from arianvp/fix-85800

Browse Source 
Fix networkd not restarting on unit changes
This commit is contained in:
Florian Klink 2020-04-23 10:36:57 +02:00 committed by GitHub
commit 04e308a496
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/monitoring/datadog-agent.nix
View File

@ -225,7 +225,7 @@ in {
Restart = "always"; Restart = "always";
RestartSec = 2; RestartSec = 2;
}; };
restartTriggers = [ datadogPkg ] ++ attrNames etcfiles; restartTriggers = [ datadogPkg ] ++ map (x: x.source) (attrValues etcfiles);
} attrs; } attrs;
in { in {
datadog-agent = makeService { datadog-agent = makeService {

2
nixos/modules/system/boot/networkd.nix
View File

@ -1073,7 +1073,7 @@ in
systemd.services.systemd-networkd = { systemd.services.systemd-networkd = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
restartTriggers = attrNames unitFiles; restartTriggers = map (x: x.source) (attrValues unitFiles);
# prevent race condition with interface renaming (#39069) # prevent race condition with interface renaming (#39069)
requires = [ "systemd-udev-settle.service" ]; requires = [ "systemd-udev-settle.service" ];
after = [ "systemd-udev-settle.service" ]; after = [ "systemd-udev-settle.service" ];