Merge pull request #85815 from arianvp/fix-85800

Fix networkd not restarting on unit changes

authored by

Florian Klink and committed by
GitHub
04e308a4 d0b92123

+2 -2
+1 -1
nixos/modules/services/monitoring/datadog-agent.nix
··· 225 Restart = "always"; 226 RestartSec = 2; 227 }; 228 - restartTriggers = [ datadogPkg ] ++ attrNames etcfiles; 229 } attrs; 230 in { 231 datadog-agent = makeService {
··· 225 Restart = "always"; 226 RestartSec = 2; 227 }; 228 + restartTriggers = [ datadogPkg ] ++ map (x: x.source) (attrValues etcfiles); 229 } attrs; 230 in { 231 datadog-agent = makeService {
+1 -1
nixos/modules/system/boot/networkd.nix
··· 1073 1074 systemd.services.systemd-networkd = { 1075 wantedBy = [ "multi-user.target" ]; 1076 - restartTriggers = attrNames unitFiles; 1077 # prevent race condition with interface renaming (#39069) 1078 requires = [ "systemd-udev-settle.service" ]; 1079 after = [ "systemd-udev-settle.service" ];
··· 1073 1074 systemd.services.systemd-networkd = { 1075 wantedBy = [ "multi-user.target" ]; 1076 + restartTriggers = map (x: x.source) (attrValues unitFiles); 1077 # prevent race condition with interface renaming (#39069) 1078 requires = [ "systemd-udev-settle.service" ]; 1079 after = [ "systemd-udev-settle.service" ];