summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2022-12-09 11:34:05 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-12-09 11:01:01 +0000
commit7ad59dcb049b83f6bee1e2cde864c73b4bd1e080 (patch)
tree3c43ef0767940387e035b6f39dc2a66464a494a3
parentnixos/kernel: link manual (with backport policies) from boot.kernelPackages (diff)
downloadnixpkgs-origin/backport-204780-to-release-22.11.tar.gz
nixos/doc: suggest using the latest longterm kernel for ZFSorigin/backport-204780-to-release-22.11
(cherry picked from commit 8476b02749ac97b49629745ded7b8b333c8d024a)
-rw-r--r--nixos/doc/manual/configuration/linux-kernel.chapter.md5
-rw-r--r--nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml12
2 files changed, 13 insertions, 4 deletions
diff --git a/nixos/doc/manual/configuration/linux-kernel.chapter.md b/nixos/doc/manual/configuration/linux-kernel.chapter.md
index 87c1cf6a7cb8..7b84416a8646 100644
--- a/nixos/doc/manual/configuration/linux-kernel.chapter.md
+++ b/nixos/doc/manual/configuration/linux-kernel.chapter.md
@@ -152,7 +152,10 @@ $ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox module
## ZFS {#sec-linux-zfs}
It's a common issue that the latest stable version of ZFS doesn't support the latest
-available Linux kernel. It's possible to pin the system to the latest available kernel
+available Linux kernel. It is recommended to use the latest available LTS that's compatible
+with ZFS. Usually this is the default kernel provided by nixpkgs (i.e. `pkgs.linuxPackages`).
+
+Alternatively, it's possible to pin the system to the latest available kernel
version *that is supported by ZFS* like this:
```nix
diff --git a/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml
index 7fb3ba5ac98f..dd570e1d66c2 100644
--- a/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml
+++ b/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml
@@ -171,9 +171,15 @@ $ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox module
<title>ZFS</title>
<para>
It’s a common issue that the latest stable version of ZFS doesn’t
- support the latest available Linux kernel. It’s possible to pin
- the system to the latest available kernel version <emphasis>that
- is supported by ZFS</emphasis> like this:
+ support the latest available Linux kernel. It is recommended to
+ use the latest available LTS that’s compatible with ZFS. Usually
+ this is the default kernel provided by nixpkgs (i.e.
+ <literal>pkgs.linuxPackages</literal>).
+ </para>
+ <para>
+ Alternatively, it’s possible to pin the system to the latest
+ available kernel version <emphasis>that is supported by
+ ZFS</emphasis> like this:
</para>
<programlisting language="bash">
{