Merge pull request #251118 from jmbaur/tpm-crb-initrd

nixos/systemd-initrd: disable tpm-crb if on armv7l-linux
NixOS · Sep 7, 2023 · e45dcb6 · e45dcb6
2 parents a17bb78 + c47f423
commit e45dcb6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
@@ -351,7 +351,7 @@ in {
       "autofs4"
       # systemd-cryptenroll
     ] ++ lib.optional cfg.enableTpm2 "tpm-tis"
-    ++ lib.optional (cfg.enableTpm2 && pkgs.stdenv.hostPlatform.system != "riscv64-linux") "tpm-crb";
+    ++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb";
 
     boot.initrd.systemd = {
       initrdBin = [pkgs.bash pkgs.coreutils cfg.package.kmod cfg.package] ++ config.system.fsPackages;