diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-10-11 14:55:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 14:55:33 +0200 |
| commit | e7f67f97f2cbf6151ef7d803260c26dd58988723 (patch) | |
| tree | cf67d4fc881fa5d229524ef3935ea9230d969699 /nixos | |
| parent | e3d97997fff1bad6fbef5001619dc5a0910a2364 (diff) | |
| parent | 27420636772da3301d8eed2af417869f7eceac4f (diff) | |
| download | nixlib-e7f67f97f2cbf6151ef7d803260c26dd58988723.tar nixlib-e7f67f97f2cbf6151ef7d803260c26dd58988723.tar.gz nixlib-e7f67f97f2cbf6151ef7d803260c26dd58988723.tar.bz2 nixlib-e7f67f97f2cbf6151ef7d803260c26dd58988723.tar.lz nixlib-e7f67f97f2cbf6151ef7d803260c26dd58988723.tar.xz nixlib-e7f67f97f2cbf6151ef7d803260c26dd58988723.tar.zst nixlib-e7f67f97f2cbf6151ef7d803260c26dd58988723.zip | |
Merge pull request #47252 from xeji/p/fix-47210
nixos/network-interfaces-scripted: fix a container networking bug
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/tasks/network-interfaces-scripted.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index af61c95da0af..93dfefdce902 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -85,7 +85,8 @@ let after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ]; before = [ "network.target" "shutdown.target" ]; wants = [ "network.target" ]; - partOf = map (i: "network-addresses-${i.name}.service") interfaces; + # exclude bridges from the partOf relationship to fix container networking bug #47210 + partOf = map (i: "network-addresses-${i.name}.service") (filter (i: !(hasAttr i.name cfg.bridges)) interfaces); conflicts = [ "shutdown.target" ]; wantedBy = [ "multi-user.target" ] ++ optional hasDefaultGatewaySet "network-online.target"; |