summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-10 20:33:46 +0200
committerGitHub <noreply@github.com>2019-06-10 20:33:46 +0200
commitc93b8d6b02c7ec0c91af34481133001421b9628d (patch)
treecd0fb44e30fa011ba49e462478fe3d58e5c77fed /cmd
parenta89d013b12049ebef604c6978fc3b581d6ecb81c (diff)
parent629017bb197bcda31ac129fb712ba3c6917b100b (diff)
downloadpodman-c93b8d6b02c7ec0c91af34481133001421b9628d.tar.gz
podman-c93b8d6b02c7ec0c91af34481133001421b9628d.tar.bz2
podman-c93b8d6b02c7ec0c91af34481133001421b9628d.zip
Merge pull request #3240 from rhatdan/storageopts
When you change the storage driver we ignore the storage-options
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/libpodruntime/runtime.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go
index 898c81515..d83a71250 100644
--- a/cmd/podman/libpodruntime/runtime.go
+++ b/cmd/podman/libpodruntime/runtime.go
@@ -67,7 +67,10 @@ func getRuntime(ctx context.Context, c *cliconfig.PodmanCommand, renumber bool,
if c.Flags().Changed("storage-driver") {
storageSet = true
storageOpts.GraphDriverName = c.GlobalFlags.StorageDriver
+ // Overriding the default storage driver caused GraphDriverOptions from storage.conf to be ignored
+ storageOpts.GraphDriverOptions = []string{}
}
+ // This should always be checked after storage-driver is checked
if len(c.GlobalFlags.StorageOpts) > 0 {
storageSet = true
storageOpts.GraphDriverOptions = c.GlobalFlags.StorageOpts