diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-03-06 20:42:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-06 20:42:44 -0500 |
| commit | 2027f8e74aac5596a02bf26a6b837d4daff3be9c (patch) | |
| tree | e116c4b12933437c974cfb94978600efee8ae730 | |
| parent | 6f88f8ca1b94785fbe8dab8ac153504b68256e34 (diff) | |
| parent | 55996b8daf9549cc1b7484be5384e52ee3c77bae (diff) | |
| download | nixpkgs-2027f8e74aac5596a02bf26a6b837d4daff3be9c.tar nixpkgs-2027f8e74aac5596a02bf26a6b837d4daff3be9c.tar.gz nixpkgs-2027f8e74aac5596a02bf26a6b837d4daff3be9c.tar.bz2 nixpkgs-2027f8e74aac5596a02bf26a6b837d4daff3be9c.tar.lz nixpkgs-2027f8e74aac5596a02bf26a6b837d4daff3be9c.tar.xz nixpkgs-2027f8e74aac5596a02bf26a6b837d4daff3be9c.tar.zst nixpkgs-2027f8e74aac5596a02bf26a6b837d4daff3be9c.zip | |
Merge pull request #23522 from oxij/nixos/mstpd-rstp
nixos: network-interfaces-scripted: don't require mstpd when rstp is off
| -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 179300ef166..3571e00d04e 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"; |