summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-04-05 20:55:15 +0200
committerGitHub <noreply@github.com>2021-04-05 20:55:15 +0200
commit6b23fece7348cd52949a3dd7b7e65483e3cac19b (patch)
tree7b0216fc4797550c6f97fe8623e29bac2c1fb496 /pkg
parente9e4898048fe669263ca16929132ea63edf0ccef (diff)
parent69ace205356171835d920438fe411839c543f073 (diff)
downloadpodman-6b23fece7348cd52949a3dd7b7e65483e3cac19b.tar.gz
podman-6b23fece7348cd52949a3dd7b7e65483e3cac19b.tar.bz2
podman-6b23fece7348cd52949a3dd7b7e65483e3cac19b.zip
Merge pull request #9911 from rhatdan/storage
Allow users to override default storage opts with --storage-opt
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())