diff options
author | Arnold Krille <arnold@arnoldarts.de> | 2016-10-11 23:18:02 +0200 |
---|---|---|
committer | Arnold Krille <arnold@arnoldarts.de> | 2016-10-12 00:16:34 +0200 |
commit | f16f4daa5be710656fece7fcc6d005a759a6cf87 (patch) | |
tree | 12649de9111db1efe68c66d14d4e4d9455971fae | |
parent | 550df4dc47db5fb2f4911ef318ce941ba22da4f4 (diff) | |
download | nixlib-f16f4daa5be710656fece7fcc6d005a759a6cf87.tar nixlib-f16f4daa5be710656fece7fcc6d005a759a6cf87.tar.gz nixlib-f16f4daa5be710656fece7fcc6d005a759a6cf87.tar.bz2 nixlib-f16f4daa5be710656fece7fcc6d005a759a6cf87.tar.lz nixlib-f16f4daa5be710656fece7fcc6d005a759a6cf87.tar.xz nixlib-f16f4daa5be710656fece7fcc6d005a759a6cf87.tar.zst nixlib-f16f4daa5be710656fece7fcc6d005a759a6cf87.zip |
sit interfaces: fix dependency tracking
-rw-r--r-- | nixos/modules/tasks/network-interfaces-scripted.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 301f7117060c..c50ea5c79643 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -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) ]; |