about summary refs log tree commit diff
path: root/nixos/modules/security
diff options
context:
space:
mode:
authorAdam C. Stephens <2071575+adamcstephens@users.noreply.github.com>2024-03-01 10:09:12 -0500
committerGitHub <noreply@github.com>2024-03-01 10:09:12 -0500
commitb52452f8c780c66c917fb51c3de14ca28f87aaa9 (patch)
tree6c8b240549a23d64b42fd967fe7e1b174f25333c /nixos/modules/security
parent8147f49e28c9dd5219944095396212a59b8d530c (diff)
parent29a1b11f916e5994f7ad23039ae21945df99247c (diff)
Merge pull request #291951 from amarshall/zfs-pkgs-renaming
zfs: rename zfsStable -> zfs_2_2; zfsUnstable -> zfs_unstable; remove enableUnstable option in favor of package
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 b87e22b23980c..560e5eff5c39a 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -1465,9 +1465,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`).
         '';
       }
       {