From f16f4daa5be710656fece7fcc6d005a759a6cf87 Mon Sep 17 00:00:00 2001 From: Arnold Krille Date: Tue, 11 Oct 2016 23:18:02 +0200 Subject: [PATCH] sit interfaces: fix dependency tracking --- nixos/modules/tasks/network-interfaces-scripted.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 301f7117060..c50ea5c7964 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) ];