From c47f423a9d5eee1a97b1869102d8f4eed50a0a69 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Thu, 24 Aug 2023 00:59:36 -0700 Subject: nixos/systemd-initrd: disable tpm-crb if on armv7l-linux In addition to the existing riscv64 exception, also disable adding the tpm-crb module to the initrd if the host platform is armv7. --- nixos/modules/system/boot/systemd/initrd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 1b9584cb57bb..5d9fca7a605e 100644 --- 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; -- cgit 1.4.1