diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-09-07 02:54:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-07 02:54:26 +0200 |
| commit | e45dcb6b8da4c18e0427ac383fa15e3785b67fad (patch) | |
| tree | cef17396041f2efc1f6ac4c3bf8890c90dac3b6d /nixos | |
| parent | a17bb78eb3dbd787edb62183e10d420a67f203ed (diff) | |
| parent | c47f423a9d5eee1a97b1869102d8f4eed50a0a69 (diff) | |
| download | nixlib-e45dcb6b8da4c18e0427ac383fa15e3785b67fad.tar nixlib-e45dcb6b8da4c18e0427ac383fa15e3785b67fad.tar.gz nixlib-e45dcb6b8da4c18e0427ac383fa15e3785b67fad.tar.bz2 nixlib-e45dcb6b8da4c18e0427ac383fa15e3785b67fad.tar.lz nixlib-e45dcb6b8da4c18e0427ac383fa15e3785b67fad.tar.xz nixlib-e45dcb6b8da4c18e0427ac383fa15e3785b67fad.tar.zst nixlib-e45dcb6b8da4c18e0427ac383fa15e3785b67fad.zip | |
Merge pull request #251118 from jmbaur/tpm-crb-initrd
nixos/systemd-initrd: disable tpm-crb if on armv7l-linux
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; |