diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-24 16:01:07 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-25 14:06:38 +0200 |
| commit | 13a110e69655d78930999ecb6b0a03a8991ab302 (patch) | |
| tree | ddcef5c16d5d360144b141beea743e802d23690a | |
| parent | 3a670daa9882de4c7a95f81a36e988c5771c1724 (diff) | |
| download | nixlib-13a110e69655d78930999ecb6b0a03a8991ab302.tar nixlib-13a110e69655d78930999ecb6b0a03a8991ab302.tar.gz nixlib-13a110e69655d78930999ecb6b0a03a8991ab302.tar.bz2 nixlib-13a110e69655d78930999ecb6b0a03a8991ab302.tar.lz nixlib-13a110e69655d78930999ecb6b0a03a8991ab302.tar.xz nixlib-13a110e69655d78930999ecb6b0a03a8991ab302.tar.zst nixlib-13a110e69655d78930999ecb6b0a03a8991ab302.zip | |
nixos/network-interfaces: cannot delay device units
Systemd is complaining that it can't delay the startup of device units. We have a before dependency on the respective device unit for every netdev service, which doesn't make any sense because we create the actual interface in this service.
| -rw-r--r-- | nixos/modules/tasks/network-interfaces-scripted.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 26fba1d5adbb..b432ef38d410 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -210,7 +210,7 @@ let after = [ "dev-net-tun.device" "network-pre.target" ]; wantedBy = [ "network-setup.service" (subsystemDevice i.name) ]; partOf = [ "network-setup.service" ]; - before = [ "network-setup.service" (subsystemDevice i.name) ]; + before = [ "network-setup.service" ]; path = [ pkgs.iproute ]; serviceConfig = { Type = "oneshot"; @@ -236,7 +236,7 @@ let partOf = [ "network-setup.service" ] ++ optional v.rstp "mstpd.service"; after = [ "network-pre.target" ] ++ deps ++ optional v.rstp "mstpd.service" ++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces; - before = [ "network-setup.service" (subsystemDevice n) ]; + before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute ]; @@ -335,7 +335,7 @@ let partOf = [ "network-setup.service" ]; after = [ "network-pre.target" ] ++ deps ++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces; - before = [ "network-setup.service" (subsystemDevice n) ]; + before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute pkgs.gawk ]; @@ -373,7 +373,7 @@ let bindsTo = deps; partOf = [ "network-setup.service" ]; after = [ "network-pre.target" ] ++ deps; - before = [ "network-setup.service" (subsystemDevice n) ]; + before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute ]; @@ -398,7 +398,7 @@ let bindsTo = deps; partOf = [ "network-setup.service" ]; after = [ "network-pre.target" ] ++ deps; - before = [ "network-setup.service" (subsystemDevice n) ]; + before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute ]; @@ -426,7 +426,7 @@ let bindsTo = deps; partOf = [ "network-setup.service" ]; after = [ "network-pre.target" ] ++ deps; - before = [ "network-setup.service" (subsystemDevice n) ]; + before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute ]; |