diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-25 09:35:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 09:35:03 -0400 |
| commit | a9f8fb9cea7763e45e2e848a62df345d79893ef0 (patch) | |
| tree | f6826812a0cf2d27d66fe963893d31d04434c57a /pkg | |
| parent | ba6356280a86531d3cda7016859aef98bb3d8272 (diff) | |
| parent | 13079abe3f7998f01d1b2e30dae3660cfb5a98c8 (diff) | |
| download | podman-a9f8fb9cea7763e45e2e848a62df345d79893ef0.tar.gz podman-a9f8fb9cea7763e45e2e848a62df345d79893ef0.tar.bz2 podman-a9f8fb9cea7763e45e2e848a62df345d79893ef0.zip | |
Merge pull request #13981 from rhatdan/volume
Add support for passing --volumepath
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/domain/infra/runtime_libpod.go | 4 | ||||
| -rw-r--r-- | pkg/specgenutil/util.go | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go index 5fdc252e2..ac557e9de 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -209,6 +209,10 @@ func getRuntime(ctx context.Context, fs *flag.FlagSet, opts *engineOpts) (*libpo options = append(options, libpod.WithEventsLogger(cfg.Engine.EventsLogger)) } + if fs.Changed("volumepath") { + options = append(options, libpod.WithVolumePath(cfg.Engine.VolumePath)) + } + if fs.Changed("cgroup-manager") { options = append(options, libpod.WithCgroupManager(cfg.Engine.CgroupManager)) } else { diff --git a/pkg/specgenutil/util.go b/pkg/specgenutil/util.go index 80d31398b..fa2e90457 100644 --- a/pkg/specgenutil/util.go +++ b/pkg/specgenutil/util.go @@ -281,6 +281,7 @@ func CreateExitCommandArgs(storageConfig storageTypes.StoreOptions, config *conf "--tmpdir", config.Engine.TmpDir, "--network-config-dir", config.Network.NetworkConfigDir, "--network-backend", config.Network.NetworkBackend, + "--volumepath", config.Engine.VolumePath, } if config.Engine.OCIRuntime != "" { command = append(command, []string{"--runtime", config.Engine.OCIRuntime}...) |