diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index d9bb1f0a0d33e..6dd2023cd27f9 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1325,6 +1325,16 @@ Superuser created successfully. services.ddclient.passwordFile. + + + The zfsUnstable package now disables the + kernel compatibility checks. This way it can always be used + with the latest kernel even if it has not been marked + compatible by upstream. The documentation of the + boot.zfs.enableUnstable option has been + updated to reflect this change. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 24d8747388840..92123949f8c65 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -398,6 +398,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `services.ddclient.password` option was removed, and replaced with `services.ddclient.passwordFile`. +- The `zfsUnstable` package now disables the kernel compatibility checks. This way it can always be used with the latest kernel even if it has not been marked compatible by upstream. The documentation of the `boot.zfs.enableUnstable` option has been updated to reflect this change. + ## Other Notable Changes {#sec-release-21.11-notable-changes} diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 65364801c32aa..5af97699cb9df 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -121,10 +121,12 @@ in description = '' Use the unstable zfs package. This might be an option, if the latest kernel is not yet supported by a published release of ZFS. Enabling - this option will install a development version of ZFS on Linux. The - version will have already passed an extensive test suite, but it is - more likely to hit an undiscovered bug compared to running a released - version of ZFS on Linux. + this option will install a development version of ZFS on Linux. + + Caution: This version will have already passed an + extensive test suite, but it has all kernel compatibility checks + disabled and is more likely to hit an undiscovered bug compared to + running a released version of OpenZFS. ''; }; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 8e2345ec3a4e4..575778b492332 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -225,9 +225,9 @@ in { }; zfsUnstable = common { - # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; - latestCompatibleLinuxPackages = linuxPackages_5_14; + # kernel compatibility checks are disabled + kernelCompatible = true; + latestCompatibleLinuxPackages = pkgs.linuxPackages_latest; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the