Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: 79b4e5a8d7efe534647e2d5287f606883fc555a3
https://github.com/NixOS/nixpkgs/commit/79b4e5a8d7efe534647e2d5287f606883fc555a3
Author: Benno Fünfstück <[email protected]>
Date: 2015-12-24 (Thu, 24 Dec 2015)
Changed paths:
M nixos/modules/virtualisation/docker.nix
Log Message:
-----------
docker module: fix kernel module loading
The docker module used different code for socket-activated docker daemon than
for the non-socket activated daemon.
In particular, if the socket-activated daemon is used, then modprobe wasn't set
up to be usable and in PATH for
the docker daemon, which resulted in a failure to start the daemon with
overlayfs as storageDriver if the
`overlay` kernel module wasn't already loaded. This commit fixes that bug
(which only appears if socket
activation is used), and also reduces the duplication between code paths so
that it's easier to keep
both in sync in future.
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
