about summary refs log tree commit diff
path: root/nixos/modules/security
diff options
context:
space:
mode:
authorAndrew Marshall <andrew@johnandrewmarshall.com>2024-02-27 18:31:29 -0500
committerAndrew Marshall <andrew@johnandrewmarshall.com>2024-02-27 18:46:00 -0500
commit2e36c49949f90f14a2ffcc002c8f411b725022d2 (patch)
treeafc625f9317b05dd478e95055a10368e8de46722 /nixos/modules/security
parent929fcf93358a833003435c0f74b9bd993f9546d0 (diff)
downloadnixlib-2e36c49949f90f14a2ffcc002c8f411b725022d2.tar
nixlib-2e36c49949f90f14a2ffcc002c8f411b725022d2.tar.gz
nixlib-2e36c49949f90f14a2ffcc002c8f411b725022d2.tar.bz2
nixlib-2e36c49949f90f14a2ffcc002c8f411b725022d2.tar.lz
nixlib-2e36c49949f90f14a2ffcc002c8f411b725022d2.tar.xz
nixlib-2e36c49949f90f14a2ffcc002c8f411b725022d2.tar.zst
nixlib-2e36c49949f90f14a2ffcc002c8f411b725022d2.zip
nixos/pam: Do not incorrectly use zfs.enableUnstable in assertion
`zfs.enableUnstable` only has an effect if `zfs.enabled = true`, so only
require `zfs.enabled` to be true here.
Diffstat (limited to 'nixos/modules/security')
-rw-r--r--nixos/modules/security/pam.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index ed03254cb5ee..cd10a9b500ee 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -1458,9 +1458,9 @@ in
         '';
       }
       {
-        assertion = config.security.pam.zfs.enable -> (config.boot.zfs.enabled || config.boot.zfs.enableUnstable);
+        assertion = config.security.pam.zfs.enable -> config.boot.zfs.enabled;
         message = ''
-          `security.pam.zfs.enable` requires enabling ZFS (`boot.zfs.enabled` or `boot.zfs.enableUnstable`).
+          `security.pam.zfs.enable` requires enabling ZFS (`boot.zfs.enabled`).
         '';
       }
       {