diff options
| author | Shea Levy <shea@shealevy.com> | 2016-08-15 19:05:52 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2016-08-15 19:05:52 -0400 |
| commit | 9adad8612b082bcbae30c81678a04b79a44079a4 (patch) | |
| tree | 6814d056ee2960d122842dc9c830bb411c40d5ff /nixos/modules/virtualisation/docker.nix | |
| parent | 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1 (diff) | |
Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
Was meant to go into staging, sorry
This reverts commit 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1, reversing
changes made to 760b2b9048ea775c319cb348d74447a20dea513e.
Diffstat (limited to 'nixos/modules/virtualisation/docker.nix')
| -rw-r--r-- | nixos/modules/virtualisation/docker.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index ebc2be087a5b..c99fc78d49e7 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -95,7 +95,8 @@ in LimitNPROC = 1048576; } // proxy_env; - path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); + path = [ config.system.sbin.modprobe ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); + environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules"; postStart = if cfg.socketActivation then "" else cfg.postStart; |