Unverified Commit d9bdb87f authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

Merge pull request #307498 from SuperSandro2000/podman-storage-default 

nixos/containers: move storage.settings default into config
parents a817fdac aaa86f29

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;