summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2021-03-31 16:45:35 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2021-04-05 12:48:09 -0400
commit69ace205356171835d920438fe411839c543f073 (patch)
tree8f5308c53db09736908a477e5fc5466702ade2ee /pkg
parent3fae801a3714ac058c5d19edf7f2288c18e84195 (diff)
downloadpodman-69ace205356171835d920438fe411839c543f073.tar.gz
podman-69ace205356171835d920438fe411839c543f073.tar.bz2
podman-69ace205356171835d920438fe411839c543f073.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')
-rw-r--r--pkg/domain/infra/runtime_libpod.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go
index b0d9dc797..a98c9168a 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())