Skip to content

Commit

Permalink
fixup! better option name
Browse files Browse the repository at this point in the history
  • Loading branch information
Atemu committed Dec 5, 2024
1 parent 859fc4e commit f788d99
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions nixos/modules/tasks/filesystems/zfs.nix
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,12 @@ in
modulePackage = lib.mkOption {
internal = true; # It is supposed to be selected automatically, but can be overridden by expert users.
default = selectModulePackage cfgZfs.package;
apply = pkg: pkg.override { inherit (cfgZfs) allowNonLTS; };
apply = pkg: pkg.override { inherit (cfgZfs) allowNonLTSKernels; };
type = lib.types.package;
description = "Configured ZFS kernel module package.";
};

allowNonLTS = lib.mkEnableOption ''
allowNonLTSKernels = lib.mkEnableOption ''
usage of ZFS with non-LTS kernels. This is likely to break in most cases
and therefore not a supported. This option exists as a convenience for
those who wish to run their systems in an unsupported manner.
Expand Down
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/zfs/generic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ let
, extraPatches ? []
, rev ? "zfs-${version}"
, kernelCompatible ? null
, allowNonLTS ? false # Whether to allow usage with unsupported kernels
, allowNonLTSKernels ? false # Whether to allow usage with unsupported kernels
, maintainers ? (with lib.maintainers; [ amarshall ])
, tests
}@innerArgs:
Expand All @@ -55,7 +55,7 @@ let
isLTS = kernel.passthru.isLTS or false;
in

lib.warnIf (!(buildKernel -> !isLTS -> allowNonLTS)) ''
lib.warnIf (!(buildKernel -> !isLTS -> allowNonLTSKernels)) ''
You are using the ZFS kernel module in combination with a non-LTS kernel:
${kernel.modDirVersion}
Expand All @@ -73,7 +73,7 @@ let
See https://www.kernel.org/ for more information on LTS kernel releases.
If you are willing to risk running into the described issue, this warning
can be suppressed using `boot.zfs.allowNonLTS = true`.
can be suppressed using `boot.zfs.allowNonLTSKernels = true`.
''

(stdenv'.mkDerivation {
Expand Down

0 comments on commit f788d99

Please sign in to comment.