From 6cd3dd3c64ac3e2ea0b575769e4235e193fec8f2 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Wed, 18 Dec 2024 22:48:41 -0500 Subject: [PATCH] incus: fix CSM support --- nixos/modules/virtualisation/incus.nix | 4 ++++ nixos/tests/incus/incus-tests.nix | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index aa2102f49f0d..4292662a9152 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -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 [ diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index e4a5f0d0a079..fb4599058225 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -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