summary refs log tree commit diff
diff options
context:
space:
mode:
authorCalum MacRae <hi@cmacr.ae>2021-02-08 21:45:02 +0000
committerSandro Jäckel <sandro.jaeckel@gmail.com>2023-04-15 01:15:46 +0200
commit7d03f1aa9f1b356064c6f12d619498a264df334b (patch)
treee91305086531d79ed370102179ae7504e39fa241
parentd9d1f5627efc4131ebcfbf6e833c871a3653d6bf (diff)
downloadnixpkgs-7d03f1aa9f1b356064c6f12d619498a264df334b.tar
nixpkgs-7d03f1aa9f1b356064c6f12d619498a264df334b.tar.gz
nixpkgs-7d03f1aa9f1b356064c6f12d619498a264df334b.tar.bz2
nixpkgs-7d03f1aa9f1b356064c6f12d619498a264df334b.tar.lz
nixpkgs-7d03f1aa9f1b356064c6f12d619498a264df334b.tar.xz
nixpkgs-7d03f1aa9f1b356064c6f12d619498a264df334b.tar.zst
nixpkgs-7d03f1aa9f1b356064c6f12d619498a264df334b.zip
nixos/cri-o: add aufs, devmapper, and zfs to storageDrivers
Update the storageDrivers option to align with the supported drivers, as listed here:
https://github.com/containers/storage/blob/master/docs/containers-storage.conf.5.md#storage-table
-rw-r--r--nixos/modules/virtualisation/cri-o.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix
index 8d352e36ef9..d3cb06ea21b 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;
+  };
 
 in
 {
@@ -20,7 +23,7 @@ in
     enable = mkEnableOption "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 = "Storage driver to be used";
     };