about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorWill Fancher <elvishjerricco@gmail.com>2024-03-18 17:46:11 -0400
committerGitHub <noreply@github.com>2024-03-18 17:46:11 -0400
commit57f69255d7fa7e2ed143a021952260740de8fa57 (patch)
tree00432f157268e6afeaffb9bea61747c1fa55b72f /nixos/modules
parent2b22c6dbd4920c9e26a5684704b4d39819ac9e16 (diff)
parenta72afcbc4896f1bff362cd65d0656f6f0207cdb6 (diff)
downloadnixlib-57f69255d7fa7e2ed143a021952260740de8fa57.tar
nixlib-57f69255d7fa7e2ed143a021952260740de8fa57.tar.gz
nixlib-57f69255d7fa7e2ed143a021952260740de8fa57.tar.bz2
nixlib-57f69255d7fa7e2ed143a021952260740de8fa57.tar.lz
nixlib-57f69255d7fa7e2ed143a021952260740de8fa57.tar.xz
nixlib-57f69255d7fa7e2ed143a021952260740de8fa57.tar.zst
nixlib-57f69255d7fa7e2ed143a021952260740de8fa57.zip
Merge pull request #293591 from lf-/jade/fix-luksroot-assert
nixos.luksroot: fix assertion message to name correct option
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/system/boot/luksroot.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 86a3875e2c67..3020734783e7 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -982,8 +982,10 @@ in
         }
         { assertion = config.boot.initrd.systemd.enable -> !luks.fido2Support;
           message = ''
-            systemd stage 1 does not support configuring FIDO2 unlocking through `boot.initrd.luks.devices.<name>.fido2`.
-            Use systemd-cryptenroll(1) to configure FIDO2 support.
+            systemd stage 1 does not support configuring FIDO2 unlocking through `boot.initrd.luks.fido2Support`.
+            Use systemd-cryptenroll(1) to configure FIDO2 support, and set
+            `boot.initrd.luks.devices.''${DEVICE}.crypttabExtraOpts` as appropriate per crypttab(5)
+            (e.g. `fido2-device=auto`).
           '';
         }
         # TODO