diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2016-09-07 10:09:20 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2017-03-05 14:40:59 +0000 |
| commit | 55996b8daf9549cc1b7484be5384e52ee3c77bae (patch) | |
| tree | cb83a451ce6d28145688e1d914965b9d5ab0edb5 /nixos/modules/tasks/network-interfaces-scripted.nix | |
| parent | 4da420709d1408addd0cfd1406c18e7ec3d1d941 (diff) | |
nixos: network-interfaces-scripted: don't require mstpd when rstp is off
Diffstat (limited to 'nixos/modules/tasks/network-interfaces-scripted.nix')
| -rw-r--r-- | nixos/modules/tasks/network-interfaces-scripted.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 179300ef1667..3571e00d04ec 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -220,7 +220,7 @@ let wantedBy = [ "network-setup.service" (subsystemDevice n) ]; bindsTo = deps ++ optional v.rstp "mstpd.service"; partOf = [ "network-setup.service" ] ++ optional v.rstp "mstpd.service"; - after = [ "network-pre.target" "mstpd.service" ] ++ deps + 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) ]; serviceConfig.Type = "oneshot"; |