ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 04:02:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #213036 from SuperSandro2000/cri-o/update_storagedrivers

Browse Source 
nixos/cri-o: add aufs, devmapper, and zfs to storageDrivers
This commit is contained in:
adisbladis 2023-04-15 16:27:50 +12:00 committed by GitHub
commit 4ab1021a1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/virtualisation/cri-o.nix
View File

@ -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";
};

2
pkgs/applications/virtualization/cri-o/wrapper.nix
View File

@ -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