public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #107127 from qzle/nixos-container-extraVeth-fix

Browse Source 
Fix: nixos-container does not always apply extraVeth ips
This commit is contained in:
Lassulus 2020-12-29 19:19:46 +01:00 committed by GitHub
commit 86102ebe5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/virtualisation/nixos-containers.nix
View File

@ -56,10 +56,10 @@ let
ip -6 route add $HOST_ADDRESS6 dev eth0 ip -6 route add $HOST_ADDRESS6 dev eth0
ip -6 route add default via $HOST_ADDRESS6 ip -6 route add default via $HOST_ADDRESS6
fi fi
${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)}
fi fi
${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)}
# Start the regular stage 1 script. # Start the regular stage 1 script.
exec "$1" exec "$1"
'' ''
@ -223,8 +223,8 @@ let
${ipcall cfg "ip route" "$LOCAL_ADDRESS" "localAddress"} ${ipcall cfg "ip route" "$LOCAL_ADDRESS" "localAddress"}
${ipcall cfg "ip -6 route" "$LOCAL_ADDRESS6" "localAddress6"} ${ipcall cfg "ip -6 route" "$LOCAL_ADDRESS6" "localAddress6"}
fi fi
${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)}
fi fi
${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)}
'' ''
); );