nixos/containers: add bridge without address specified #53419
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
uvNikita
force-pushed
the
containers/fix-bridge
branch
from
a26c94f
to
659f780
Compare
According to systemd-nspawn(1), --network-bridge implies --network-veth, and --port option is supported only when private networking is enabled. Fixes NixOS#52417.
uvNikita
force-pushed
the
containers/fix-bridge
branch
from
659f780
to
53013ea
Compare
|
I now added a test that checks that bridge is actually created without local/host IP addresses specified. |
arianvp
approved these changes
Jan 8, 2019
|
@Mic92 can you please look at this one? It would be nice to fix the regression introduced in the master branch. |
|
@flokli I see you have been doing some work in nixos containers, maybe you can review and merge this PR? Sorry for bothering, but it would be nice to merge it quite quickly since it's breaking some people's set up. |
|
@uvNikita sorry for keeping this lingering around - thanks for highlighting. Merged. |
|
@flokli thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
According to systemd-nspawn(1), --network-bridge implies --network-veth,
and --port option is supported only when private networking is enabled.
Fixes #52417.
Things done
Tests in
nixos/tests/containers-*seem to pass, but I haven't actually tested if it works when the address is assigned by dhcp.sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)