diff options
| -rw-r--r-- | nixos/modules/virtualisation/cri-o.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/cri-o/wrapper.nix | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 3503a6fff6a9..dacd700537c7 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -4,7 +4,10 @@ with lib; let cfg = config.virtualisation.cri-o; - crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; }); + crioPackage = pkgs.cri-o.override { + extraPackages = cfg.extraPackages + ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package; + }; format = pkgs.formats.toml { }; @@ -19,7 +22,7 @@ in enable = mkEnableOption (lib.mdDoc "Container Runtime Interface for OCI (CRI-O)"); storageDriver = mkOption { - type = types.enum [ "btrfs" "overlay" "vfs" ]; + type = types.enum [ "aufs" "btrfs" "devmapper" "overlay" "vfs" "zfs" ]; default = "overlay"; description = lib.mdDoc "Storage driver to be used"; }; diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix index 5d15847d9c3e..c8af1b909c84 100644 --- a/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -4,6 +4,7 @@ , lib , extraPackages ? [] , runc # Default container runtime +, conntrack-tools , crun # Container runtime (default with cgroups v2 for podman/buildah) , conmon # Container runtime monitor , util-linux # nsenter @@ -13,6 +14,7 @@ let binPath = lib.makeBinPath ([ runc + conntrack-tools crun conmon util-linux |