Merge pull request #53871 from elseym/fix-container-extraveths

nixos/containers: explicitly set link up on host for extraVeths
NixOS · Jan 14, 2019 · ca06398 · ca06398
2 parents d79e351 + 8a8bf88
commit ca06398
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
@@ -188,6 +188,8 @@ let
           ''
         else
           ''
+            echo "Bring ${name} up"
+            ip link set dev ${name} up
             # Set IPs and routes for ${name}
             ${optionalString (cfg.hostAddress != null) ''
               ip addr add ${cfg.hostAddress} dev ${name}

diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix
@@ -13,6 +13,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       virtualisation.memorySize = 768;
       virtualisation.vlans = [];
 
+      networking.useDHCP = false;
       networking.bridges = {
         br0 = {
           interfaces = [];