diff options
| author | Nicola Squartini <tensor5@gmail.com> | 2023-04-30 11:32:16 +0200 |
|---|---|---|
| committer | Nicola Squartini <tensor5@gmail.com> | 2023-05-15 09:22:39 +0200 |
| commit | 5466f767556b12a6db4bcaa6e9ab9970d28b0d29 (patch) | |
| tree | bc834ec386f851a1503fb9169d77203070b85b9a | |
| parent | 09f4bf7f166d4bf2e09b1923ae5744e6193caf44 (diff) | |
| download | nixlib-5466f767556b12a6db4bcaa6e9ab9970d28b0d29.tar nixlib-5466f767556b12a6db4bcaa6e9ab9970d28b0d29.tar.gz nixlib-5466f767556b12a6db4bcaa6e9ab9970d28b0d29.tar.bz2 nixlib-5466f767556b12a6db4bcaa6e9ab9970d28b0d29.tar.lz nixlib-5466f767556b12a6db4bcaa6e9ab9970d28b0d29.tar.xz nixlib-5466f767556b12a6db4bcaa6e9ab9970d28b0d29.tar.zst nixlib-5466f767556b12a6db4bcaa6e9ab9970d28b0d29.zip | |
nixos/pam: improve documentation of ZFS module
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2305.section.md | 2 | ||||
| -rw-r--r-- | nixos/modules/security/pam.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 4a83134fec36..a836ed99eb06 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -411,7 +411,7 @@ In addition to numerous new and upgraded packages, this release has the followin } ``` -- New option `security.pam.zfs` to enable unlocking and mounting of ZFS home dataset at login. +- New option `security.pam.zfs` to enable unlocking and mounting of encrypted ZFS home dataset at login. - `services.peertube` now requires you to specify the secret file `secrets.secretsFile`. It can be generated by running `openssl rand -hex 32`. Before upgrading, read the release notes for PeerTube: diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 75f8c174940c..55137df7afe4 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -451,7 +451,7 @@ let defaultText = literalExpression "config.security.pam.zfs.enable"; type = types.bool; description = lib.mdDoc '' - Enable unlocking and mounting of ZFS home dataset at login. + Enable unlocking and mounting of encrypted ZFS home dataset at login. ''; }; @@ -1227,7 +1227,7 @@ in default = false; type = types.bool; description = lib.mdDoc '' - Enable unlocking and mounting of ZFS home dataset at login. + Enable unlocking and mounting of encrypted ZFS home dataset at login. ''; }; @@ -1236,7 +1236,7 @@ in default = "rpool/home"; type = types.str; description = lib.mdDoc '' - Prefix of home datasets. This value will be contacenated with + Prefix of home datasets. This value will be concatenated with `"/" + <username>` in order to determine the home dataset to unlock. ''; }; |