diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-08-13 20:40:45 +0200 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-08-14 14:12:07 +0200 |
| commit | 4360a87c45f69f7444c7b87546705de7fbc8681f (patch) | |
| tree | 321157050a1e1e1ecccce78ae497ff179daa6503 /nixos/modules/tasks | |
| parent | 43595c7884533769a68f92359ca13f06dd62af97 (diff) | |
| download | nixlib-4360a87c45f69f7444c7b87546705de7fbc8681f.tar nixlib-4360a87c45f69f7444c7b87546705de7fbc8681f.tar.gz nixlib-4360a87c45f69f7444c7b87546705de7fbc8681f.tar.bz2 nixlib-4360a87c45f69f7444c7b87546705de7fbc8681f.tar.lz nixlib-4360a87c45f69f7444c7b87546705de7fbc8681f.tar.xz nixlib-4360a87c45f69f7444c7b87546705de7fbc8681f.tar.zst nixlib-4360a87c45f69f7444c7b87546705de7fbc8681f.zip | |
linuxPackages.zfsUnstable: 2018-05-22 -> 2018-08-13
spl was merged into zfs master
Diffstat (limited to 'nixos/modules/tasks')
| -rw-r--r-- | nixos/modules/tasks/filesystems/zfs.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index a7ed18a9bcda..2b3b09d725c7 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -24,7 +24,7 @@ let kernel = config.boot.kernelPackages; packages = if config.boot.zfs.enableUnstable then { - spl = kernel.splUnstable; + spl = null; zfs = kernel.zfsUnstable; zfsUser = pkgs.zfsUnstable; } else { @@ -325,12 +325,12 @@ in virtualisation.lxd.zfsSupport = true; boot = { - kernelModules = [ "spl" "zfs" ] ; - extraModulePackages = with packages; [ spl zfs ]; + kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl"; + extraModulePackages = with packages; [ zfs ] ++ optional (!cfgZfs.enableUnstable) spl; }; boot.initrd = mkIf inInitrd { - kernelModules = [ "spl" "zfs" ]; + kernelModules = [ "zfs" ] ++ optional (!cfgZfs.enableUnstable) "spl"; extraUtilsCommands = '' copy_bin_and_libs ${packages.zfsUser}/sbin/zfs |