diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-08-14 14:39:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-14 14:39:04 +0200 |
| commit | 93f9b7069ac91983d6feb76f822e94acf5593ca5 (patch) | |
| tree | 86432c71dadc12ae979dc705a4b6b1ddb58053d8 /nixos | |
| parent | ec14b03b8686d777274e14ab951a381dc0b1b5e3 (diff) | |
| parent | 4360a87c45f69f7444c7b87546705de7fbc8681f (diff) | |
| download | nixpkgs-93f9b7069ac91983d6feb76f822e94acf5593ca5.tar nixpkgs-93f9b7069ac91983d6feb76f822e94acf5593ca5.tar.gz nixpkgs-93f9b7069ac91983d6feb76f822e94acf5593ca5.tar.bz2 nixpkgs-93f9b7069ac91983d6feb76f822e94acf5593ca5.tar.lz nixpkgs-93f9b7069ac91983d6feb76f822e94acf5593ca5.tar.xz nixpkgs-93f9b7069ac91983d6feb76f822e94acf5593ca5.tar.zst nixpkgs-93f9b7069ac91983d6feb76f822e94acf5593ca5.zip | |
Merge pull request #45012 from Mic92/zfs
linuxPackages.zfsUnstable: 2018-05-22 -> 2018-08-13
Diffstat (limited to 'nixos')
| -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 a7ed18a9bcd..2b3b09d725c 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 |