summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam C. Stephens <2071575+adamcstephens@users.noreply.github.com>2024-02-27 22:06:18 -0500
committerGitHub <noreply@github.com>2024-02-27 22:06:18 -0500
commit5bfcdbdecfface57fa676cb5ef7980dfc62a6a02 (patch)
tree2b0c9207af0bbf9c36c472974a74a1e5bc7fbafb
parentMerge pull request #291954 from NixOS/backport-291933-to-release-23.11 (diff)
parentOVMF/OVMFFull: drop CSM support (diff)
downloadnixpkgs-5bfcdbdecfface57fa676cb5ef7980dfc62a6a02.tar.gz
Merge pull request #291957 from adamcstephens/ovmf/23.11-csm
[Release-23.11] OVMF/OVMFFull: drop CSM support
-rw-r--r--pkgs/applications/virtualization/OVMF/default.nix2
-rw-r--r--pkgs/top-level/all-packages.nix3
2 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index ca2c0f890d9a..dc66d625b0b8 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -12,7 +12,7 @@
, sourceDebug ? false
}:
-assert csmSupport -> seabios != null;
+assert csmSupport -> throw "CSM support has been dropped upstream due to security and maintenance concerns. For qemu, seabios is the default and can be used instead.";
let
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48a0afe17033..620b087f1344 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27117,9 +27117,6 @@ with pkgs;
OVMF = callPackage ../applications/virtualization/OVMF { };
OVMFFull = callPackage ../applications/virtualization/OVMF {
secureBoot = true;
- # CSM support is a BIOS emulation mechanism,
- # SeaBIOS is only available on x86.
- csmSupport = stdenv.hostPlatform.isx86;
httpSupport = true;
tpmSupport = true;
};