diff options
| author | Jared Baur <jaredbaur@fastmail.com> | 2023-08-24 00:59:36 -0700 |
|---|---|---|
| committer | Jared Baur <jaredbaur@fastmail.com> | 2023-09-07 00:38:55 +0200 |
| commit | c47f423a9d5eee1a97b1869102d8f4eed50a0a69 (patch) | |
| tree | 078d7ed6c4207b2cad9abfa6cfd874d8ae042e7e /nixos | |
| parent | 347b5fb808805277b7797529d518a363fd8483e7 (diff) | |
| download | nixlib-c47f423a9d5eee1a97b1869102d8f4eed50a0a69.tar nixlib-c47f423a9d5eee1a97b1869102d8f4eed50a0a69.tar.gz nixlib-c47f423a9d5eee1a97b1869102d8f4eed50a0a69.tar.bz2 nixlib-c47f423a9d5eee1a97b1869102d8f4eed50a0a69.tar.lz nixlib-c47f423a9d5eee1a97b1869102d8f4eed50a0a69.tar.xz nixlib-c47f423a9d5eee1a97b1869102d8f4eed50a0a69.tar.zst nixlib-c47f423a9d5eee1a97b1869102d8f4eed50a0a69.zip | |
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.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/systemd/initrd.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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; |