Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1325,6 +1325,16 @@ Superuser created successfully.
<literal>services.ddclient.passwordFile</literal>.
</para>
</listitem>
<listitem>
<para>
The <literal>zfsUnstable</literal> 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
<literal>boot.zfs.enableUnstable</literal> option has been
updated to reflect this change.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-notable-changes">
Expand Down
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2111.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -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}


Expand Down
10 changes: 6 additions & 4 deletions nixos/modules/tasks/filesystems/zfs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<emphasis>Caution</emphasis>: 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.
'';
};

Expand Down
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/zfs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down