Unverified Commit 6cd3dd3c authored by Adam C. Stephens's avatar Adam C. Stephens
Browse files

incus: fix CSM support

parent d7552b8a

nixos/modules/virtualisation/incus.nix

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,10 @@ let 
      name = "OVMF_VARS.4MB.ms.fd";

      path = "${pkgs.OVMFFull.fd}/FV/${ovmf-prefix}_VARS.fd";

    }

    {

      name = "seabios.bin";

      path = "${pkgs.seabios-qemu}/share/seabios/bios.bin";

    }

  ];



  environment = lib.mkMerge [

nixos/tests/incus/incus-tests.nix

+12 −2
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ import ../make-test-python.nix ( 
        ) "" initVariants

      )

      + lib.optionalString canTestVm (

        lib.foldl (

        (lib.foldl (

          acc: variant:

          acc

          # python
@@ -362,7 +362,17 @@ import ../make-test-python.nix ( 


            cleanup()

          ''

        ) "" initVariants

        ) "" initVariants)

        +

          # python

          ''

            with subtest("Can launch CSM virtual machine"):

                machine.succeed("incus init csm --vm --empty -c security.csm=true -c security.secureboot=false")

                machine.succeed("incus start csm")





            cleanup()

          ''

      )

      +

        lib.optionalString featureUser # python