git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #57897 from rnhmjoj/fix-ipv6

nixos/containers: create veths if only IPv6 is configured

commitaf27dbf1d15de63281434ca068c46a543d4f6eee authorAndreas Rammhold <andreas@rammhold.de> dateSun 24 Mar 2019, 18:17 (8 years ago) parent994476e862615b
3 files changed+11−5
nixos/modules/virtualisation/containers.nix+9−5 nixos/release-combined.nix+1 nixos/release-small.nix+1
nixos/modules/virtualisation/containers.nix+9−5
@@ -36,8 +36,9 @@ let
3636 #! ${pkgs.runtimeShell} -e
3737
3838 # Initialise the container side of the veth pair.
39− if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || [ -n "$HOST_BRIDGE" ]; then
40−
39+ if [ -n "$HOST_ADDRESS" ] || [ -n "$HOST_ADDRESS6" ] ||
40+ [ -n "$LOCAL_ADDRESS" ] || [ -n "$LOCAL_ADDRESS6" ] ||
41+ [ -n "$HOST_BRIDGE" ]; then
4142 ip link set host0 name eth0
4243 ip link set dev eth0 up
4344
@@ -88,7 +89,8 @@ let
8889 extraFlags+=" --private-network"
8990 fi
9091
91− if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then
92+ if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] ||
93+ [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then
9294 extraFlags+=" --network-veth"
9395 fi
9496
@@ -159,7 +161,8 @@ let
159161 # Clean up existing machined registration and interfaces.
160162 machinectl terminate "$INSTANCE" 2> /dev/null || true
161163
162− if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then
164+ if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] ||
165+ [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then
163166 ip link del dev "ve-$INSTANCE" 2> /dev/null || true
164167 ip link del dev "vb-$INSTANCE" 2> /dev/null || true
165168 fi
@@ -208,7 +211,8 @@ let
208211 '';
209212 in
210213 ''
211− if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ]; then
214+ if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] ||
215+ [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then
212216 if [ -z "$HOST_BRIDGE" ]; then
213217 ifaceHost=ve-$INSTANCE
214218 ip link set dev $ifaceHost up
nixos/release-combined.nix+1
@@ -64,6 +64,7 @@ in rec {
6464 #(all nixos.tests.containers)
6565 (all nixos.tests.containers-imperative)
6666 (all nixos.tests.containers-ipv4)
67+ (all nixos.tests.containers-ipv6)
6768 nixos.tests.chromium.x86_64-linux or []
6869 (all nixos.tests.firefox)
6970 (all nixos.tests.firewall)
nixos/release-small.nix+1
@@ -33,6 +33,7 @@ in rec {
3333 inherit (nixos'.tests)
3434 containers-imperative
3535 containers-ipv4
36+ containers-ipv6
3637 firewall
3738 ipv6
3839 login