Unverified Commit 7d03f1aa authored by Calum MacRae's avatar Calum MacRae Committed by Sandro Jäckel
Browse files

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
parent d9d1f562

nixos/modules/virtualisation/cri-o.nix

+5 −2
Original line number Diff line number Diff line
@@ -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";

    };