ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

nixos/docker: Include ZFS commands in PATH for ZFS storagedriver

Browse Source 
When using the ZFS storagedriver in docker, it shells out for the ZFS
commands. The path configuration for the systemd task does not include
ZFS, so if the driver is set to ZFS, add ZFS utilities to the PATH.

This will resolve https://github.com/NixOS/nixpkgs/issues/10127

[Bjørn: prefix commit message with "nixos/docker:", remove extra space
before ';']
This commit is contained in:
Casey Ransom 2015-10-04 01:41:57 -04:00 committed by Bjørn Forsman
parent ded3dfbce6
commit 791b600aac
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/virtualisation/docker.nix
View File

@ -129,7 +129,8 @@ in
LimitNPROC = 1048576; LimitNPROC = 1048576;
} // proxy_env; } // proxy_env;
path = [ pkgs.kmod ]; path = [ pkgs.kmod ] ++
(if cfg.storageDriver == "zfs" then [ pkgs.zfs ] else []);
environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules"; environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules";
postStart = cfg.postStart; postStart = cfg.postStart;