diff options
author | adisbladis <adisbladis@gmail.com> | 2023-04-15 16:27:50 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-15 16:27:50 +1200 |
commit | 4ab1021a1b9bbb4ef76042c5d4fc9379f200f689 (patch) | |
tree | 201a41ba81d28ca5c42feb4fa36f7280000b5762 /nixos/modules/virtualisation | |
parent | 25e21b34a9d0916a764e0dc3dc853ba953aa5cbb (diff) | |
parent | 8ae1412f8e881797b2b22e5425a97138fcd5d428 (diff) |
Merge pull request #213036 from SuperSandro2000/cri-o/update_storagedrivers
nixos/cri-o: add aufs, devmapper, and zfs to storageDrivers
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r-- | nixos/modules/virtualisation/cri-o.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 3503a6fff6a99..dacd700537c78 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"; }; |