Unverified Commit aaa86f29 authored by Sandro Jäckel's avatar Sandro Jäckel
Browse files

nixos/containers: move storage.settings default into config 

This avoids having to use workarounds like the following to retain the
default settings which podman requires to run.

virtualisation.containers.storage.settings = lib.recursiveUpdate options.virtualisation.containers.storage.settings.default {
  storage.options.mount_program = lib.getExe pkgs.fuse-overlayfs;
};
parent 2058a82f

nixos/modules/virtualisation/containers.nix

+6 −7
Original line number Diff line number Diff line
@@ -53,13 +53,6 @@ in 


    storage.settings = mkOption {

      type = toml.type;

      default = {

        storage = {

          driver = "overlay";

          graphroot = "/var/lib/containers/storage";

          runroot = "/run/containers/storage";

        };

      };

      description = "storage.conf configuration";

    };
@@ -124,6 +117,12 @@ in 
      };

    };



    virtualisation.containers.storage.settings.storage = {

      driver = "overlay";

      graphroot = "/var/lib/containers/storage";

      runroot = "/run/containers/storage";

    };



    environment.etc = {

      "containers/containers.conf".source =

        toml.generate "containers.conf" cfg.containersConf.settings;