Merge pull request #23522 from oxij/nixos/mstpd-rstp

nixos: network-interfaces-scripted: don't require mstpd when rstp is off
This commit is contained in:
Graham Christensen 2017-03-06 20:42:44 -05:00 committed by GitHub
commit 2027f8e74a

View File

@ -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";