diff options
author | lewo <lewo@abesis.fr> | 2019-02-12 10:16:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-12 10:16:21 +0100 |
commit | b2f3738336a4fce6aaaec9e1b822bdc9ac6e944e (patch) | |
tree | 84c77e516b168fbac4b4f314e42477a7ebcc0dfd /nixos/modules/virtualisation | |
parent | 6dc46f3f01500757d60ba86fef548ef11b3e0bb7 (diff) | |
parent | 302c4df41dafb9cf2aef963afe94b3d5bce66f63 (diff) | |
download | nixpkgs-b2f3738336a4fce6aaaec9e1b822bdc9ac6e944e.tar nixpkgs-b2f3738336a4fce6aaaec9e1b822bdc9ac6e944e.tar.gz nixpkgs-b2f3738336a4fce6aaaec9e1b822bdc9ac6e944e.tar.bz2 nixpkgs-b2f3738336a4fce6aaaec9e1b822bdc9ac6e944e.tar.lz nixpkgs-b2f3738336a4fce6aaaec9e1b822bdc9ac6e944e.tar.xz nixpkgs-b2f3738336a4fce6aaaec9e1b822bdc9ac6e944e.tar.zst nixpkgs-b2f3738336a4fce6aaaec9e1b822bdc9ac6e944e.zip |
Merge pull request #55589 from johanot/docker-preloader-mkif-guard
nixos/dockerPreloader: guard the entire implemetation with mkIf on image list
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r-- | nixos/modules/virtualisation/docker-preloader.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/virtualisation/docker-preloader.nix b/nixos/modules/virtualisation/docker-preloader.nix index faa94f53d98..6ab83058dee 100644 --- a/nixos/modules/virtualisation/docker-preloader.nix +++ b/nixos/modules/virtualisation/docker-preloader.nix @@ -78,12 +78,11 @@ in }; }; - config = { + config = mkIf (cfg.dockerPreloader.images != []) { assertions = [{ # If docker.storageDriver is null, Docker choose the storage # driver. So, in this case, we cannot be sure overlay2 is used. - assertion = cfg.dockerPreloader.images == [] - || cfg.docker.storageDriver == "overlay2" + assertion = cfg.docker.storageDriver == "overlay2" || cfg.docker.storageDriver == "overlay" || cfg.docker.storageDriver == null; message = "The Docker image Preloader only works with overlay2 storage driver!"; |