tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge pull request #19464 from kampfschlaefer/fix_sit_evaluation

sit interfaces: fix dependency tracking

authored by

Jörg Thalheim and committed by
GitHub 2cdac99d 2ca88333

+2 -2
unified split
+2 -2
nixos/modules/tasks/network-interfaces-scripted.nix
··· 50 if (config.boot.isContainer == false) 51 then 52 # Trust udev when not in the container 53 - [ (subsystemDevice dev) ] 54 else 55 # When in the container, check whether the interface is built from other definitions 56 if (hasAttr dev cfg.bridges) || ··· 333 334 createSitDevice = n: v: nameValuePair "${n}-netdev" 335 (let 336 - deps = optionals (v.dev != null) (deviceDependency v.dev); 337 in 338 { description = "6-to-4 Tunnel Interface ${n}"; 339 wantedBy = [ "network-setup.service" (subsystemDevice n) ];
··· 50 if (config.boot.isContainer == false) 51 then 52 # Trust udev when not in the container 53 + optional (dev != null) (subsystemDevice dev) 54 else 55 # When in the container, check whether the interface is built from other definitions 56 if (hasAttr dev cfg.bridges) || ··· 333 334 createSitDevice = n: v: nameValuePair "${n}-netdev" 335 (let 336 + deps = deviceDependency v.dev; 337 in 338 { description = "6-to-4 Tunnel Interface ${n}"; 339 wantedBy = [ "network-setup.service" (subsystemDevice n) ];