Merge pull request #107127 from qzle/nixos-container-extraVeth-fix
Fix: nixos-container does not always apply extraVeth ips
commit86102ebe5ee8428478dfa7795f2a95a035546d53
authorLassulus <github@lassul.us>
dateTue 29 Dec 2020, 19:19 (6 years ago)
parent236ebcead6c2de
nixos/modules/virtualisation/nixos-containers.nix+3−3
@@ -56,10 +56,10 @@ let
5656 ip -6 route add $HOST_ADDRESS6 dev eth0
5757 ip -6 route add default via $HOST_ADDRESS6
5858 fi
59−
60− ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)}
6159 fi
6260
61+ ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)}
62+
6363 # Start the regular stage 1 script.
6464 exec "$1"
6565 ''
@@ -223,8 +223,8 @@ let
223223 ${ipcall cfg "ip route" "$LOCAL_ADDRESS" "localAddress"}
224224 ${ipcall cfg "ip -6 route" "$LOCAL_ADDRESS6" "localAddress6"}
225225 fi
226− ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)}
227226 fi
227+ ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)}
228228 ''
229229 );
230230