summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorBenno Fünfstück <benno.fuenfstueck@gmail.com>2016-06-11 21:10:27 +0200
committerBenno Fünfstück <benno.fuenfstueck@gmail.com>2016-06-11 21:13:37 +0200
commit3850123f32d498958bccf271781a12aaf1689c43 (patch)
treeeae383ec3cba8989698550c0c84ff189d5079539 /nixos
parentbb1a9d3b609bb3111a87a4fb61e12bef0938ba5c (diff)
downloadnixlib-3850123f32d498958bccf271781a12aaf1689c43.tar
nixlib-3850123f32d498958bccf271781a12aaf1689c43.tar.gz
nixlib-3850123f32d498958bccf271781a12aaf1689c43.tar.bz2
nixlib-3850123f32d498958bccf271781a12aaf1689c43.tar.lz
nixlib-3850123f32d498958bccf271781a12aaf1689c43.tar.xz
nixlib-3850123f32d498958bccf271781a12aaf1689c43.tar.zst
nixlib-3850123f32d498958bccf271781a12aaf1689c43.zip
nixos/docker: use wrapped modprobe
We need to use wrapped modprobe, so that it finds the right
modules. Docker needs modprobe to load overlay kernel module
for example.

This fixes an an error starting docker if the booted system's kernel
version is different from the /run/current-system profile's one.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/virtualisation/docker.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 97b2927cf1bd..c99fc78d49e7 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -95,7 +95,7 @@ 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;