Unverified Commit fccf3732 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

Merge pull request #288123 from adamcstephens/incus/networkd 

nixos/lxc: fix VM network and switch container to networkd
parents 8601deae cf68af85

nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix

+17 −2
Original line number Diff line number Diff line
@@ -13,8 +13,23 @@ 
      ./lxd.nix

    ];



  networking.useDHCP = false;

  networking.interfaces.eth0.useDHCP = true;

  networking = {

    dhcpcd.enable = false;

    useDHCP = false;

    useHostResolvConf = false;

  };



  systemd.network = {

    enable = true;

    networks."50-eth0" = {

      matchConfig.Name = "eth0";

      networkConfig = {

        DHCP = "ipv4";

        IPv6AcceptRA = true;

      };

      linkConfig.RequiredForOnline = "routable";

    };

  };



  system.stateVersion = "@stateVersion@"; # Did you read the comment?

}

nixos/maintainers/scripts/lxd/lxd-container-image.nix

+17 −3
Original line number Diff line number Diff line
@@ -25,7 +25,21 @@ 
    fi

  '';



  # Network

  networking.useDHCP = false;

  networking.interfaces.eth0.useDHCP = true;

  networking = {

    dhcpcd.enable = false;

    useDHCP = false;

    useHostResolvConf = false;

  };



  systemd.network = {

    enable = true;

    networks."50-eth0" = {

      matchConfig.Name = "eth0";

      networkConfig = {

        DHCP = "ipv4";

        IPv6AcceptRA = true;

      };

      linkConfig.RequiredForOnline = "routable";

    };

  };

}

nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix

+4 −3
Original line number Diff line number Diff line
@@ -14,14 +14,15 @@ 
    ];



  networking = {

    dhcdpcd.enable = false;

    dhcpcd.enable = false;

    useDHCP = false;

    useHostResolvConf = false;

  };



  systemd.network = {

    enable = true;

    networks."50-eth0" = {

      matchConfig.Name = "eth0";

    networks."50-enp5s0" = {

      matchConfig.Name = "enp5s0";

      networkConfig = {

        DHCP = "ipv4";

        IPv6AcceptRA = true;

nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix

+2 −1
Original line number Diff line number Diff line
@@ -27,8 +27,9 @@ 


  # Network

  networking = {

    dhcdpcd.enable = false;

    dhcpcd.enable = false;

    useDHCP = false;

    useHostResolvConf = false;

  };



  systemd.network = {