diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2019-03-19 11:01:57 +0100 |
|---|---|---|
| committer | rnhmjoj <rnhmjoj@inventati.org> | 2019-03-20 04:38:10 +0100 |
| commit | 552e583ef0977cdb6a17299971a62019e003c0c0 (patch) | |
| tree | f621f6e32cee4f2bc2edc68f5d7abab152ae0a33 /nixos/modules/virtualisation/containers.nix | |
| parent | 0f3146eda73d21a1d3dd6b4a4ed593cab4e1650b (diff) | |
| download | nixpkgs-552e583ef0977cdb6a17299971a62019e003c0c0.tar nixpkgs-552e583ef0977cdb6a17299971a62019e003c0c0.tar.gz nixpkgs-552e583ef0977cdb6a17299971a62019e003c0c0.tar.bz2 nixpkgs-552e583ef0977cdb6a17299971a62019e003c0c0.tar.lz nixpkgs-552e583ef0977cdb6a17299971a62019e003c0c0.tar.xz nixpkgs-552e583ef0977cdb6a17299971a62019e003c0c0.tar.zst nixpkgs-552e583ef0977cdb6a17299971a62019e003c0c0.zip | |
nixos/containers: create veths if only IPv6 is configured
This fixes the failing nixos.tests.containers-ipv6 test. Thanks to andir.
Diffstat (limited to 'nixos/modules/virtualisation/containers.nix')
| -rw-r--r-- | nixos/modules/virtualisation/containers.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 7c9909ae278..d10c4feecb4 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -36,8 +36,9 @@ let #! ${pkgs.runtimeShell} -e # Initialise the container side of the veth pair. - if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || [ -n "$HOST_BRIDGE" ]; then - + if [ -n "$HOST_ADDRESS" ] || [ -n "$HOST_ADDRESS6" ] || + [ -n "$LOCAL_ADDRESS" ] || [ -n "$LOCAL_ADDRESS6" ] || + [ -n "$HOST_BRIDGE" ]; then ip link set host0 name eth0 ip link set dev eth0 up @@ -88,7 +89,8 @@ let extraFlags+=" --private-network" fi - if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then + if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || + [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then extraFlags+=" --network-veth" fi @@ -159,7 +161,8 @@ let # Clean up existing machined registration and interfaces. machinectl terminate "$INSTANCE" 2> /dev/null || true - if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then + if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || + [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then ip link del dev "ve-$INSTANCE" 2> /dev/null || true ip link del dev "vb-$INSTANCE" 2> /dev/null || true fi @@ -208,7 +211,8 @@ let ''; in '' - if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then + if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || + [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then if [ -z "$HOST_BRIDGE" ]; then ifaceHost=ve-$INSTANCE ip link set dev $ifaceHost up |