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

Merge pull request #19464 from kampfschlaefer/fix_sit_evaluation

Browse Source 
sit interfaces: fix dependency tracking
This commit is contained in:
Jörg Thalheim 2016-10-12 13:05:14 +02:00 committed by GitHub
commit 2cdac99d24
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/tasks/network-interfaces-scripted.nix
View File

@ -50,7 +50,7 @@ in
if (config.boot.isContainer == false)
then
# Trust udev when not in the container
[ (subsystemDevice dev) ]
optional (dev != null) (subsystemDevice dev)
else
# When in the container, check whether the interface is built from other definitions
if (hasAttr dev cfg.bridges) ||
@ -333,7 +333,7 @@ in
createSitDevice = n: v: nameValuePair "${n}-netdev"
(let
deps = optionals (v.dev != null) (deviceDependency v.dev);
deps = deviceDependency v.dev;
in
{ description = "6-to-4 Tunnel Interface ${n}";
wantedBy = [ "network-setup.service" (subsystemDevice n) ];