diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-31 16:45:35 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-04-16 13:11:25 -0400 |
| commit | b3ef9e4dd8f91326b1f5e85360679ec5ffd213f9 (patch) | |
| tree | 3baa61ca6aed26b212744648ecfcfdcd800f8352 /pkg/domain | |
| parent | 19a4df75fd2dc7a914116484223d71f8b6a25192 (diff) | |
| download | podman-b3ef9e4dd8f91326b1f5e85360679ec5ffd213f9.tar.gz podman-b3ef9e4dd8f91326b1f5e85360679ec5ffd213f9.tar.bz2 podman-b3ef9e4dd8f91326b1f5e85360679ec5ffd213f9.zip | |
Allow users to override default storage opts with --storage-opt
We define in the man page that this overrides the default storage
options, but the code was appending to the existing options.
This PR also makes a change to allow users to specify --storage-opt="".
This will turn off all storage options.
https://github.com/containers/podman/issues/9852
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/infra/runtime_libpod.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go index 8b6581c7b..889a81acc 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -146,7 +146,11 @@ func getRuntime(ctx context.Context, fs *flag.FlagSet, opts *engineOpts) (*libpo // This should always be checked after storage-driver is checked if len(cfg.StorageOpts) > 0 { storageSet = true - storageOpts.GraphDriverOptions = cfg.StorageOpts + if len(cfg.StorageOpts) == 1 && cfg.StorageOpts[0] == "" { + storageOpts.GraphDriverOptions = []string{} + } else { + storageOpts.GraphDriverOptions = cfg.StorageOpts + } } if opts.migrate { options = append(options, libpod.WithMigrate()) |