summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-05-30 22:01:25 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2019-06-08 06:20:31 -0400
commit629017bb197bcda31ac129fb712ba3c6917b100b (patch)
tree0b425bd45a687ebff4a7b1e13b797237cb0dbde0 /libpod
parent6109de4b933aac368fa6ff73330abe3cea7ce837 (diff)
downloadpodman-629017bb197bcda31ac129fb712ba3c6917b100b.tar.gz
podman-629017bb197bcda31ac129fb712ba3c6917b100b.tar.bz2
podman-629017bb197bcda31ac129fb712ba3c6917b100b.zip
When you change the storage driver we ignore the storage-options
The storage driver and the storage options in storage.conf should match, but if you change the storage driver via the command line then we need to nil out the default storage options from storage.conf. If the user wants to change the storage driver and use storage options, they need to specify them on the command line. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container_internal.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index c0b5e4302..9245a8840 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -360,7 +360,8 @@ func (c *Container) setupStorage(ctx context.Context) error {
}
return false
}
- defOptions, err := storage.GetDefaultMountOptions()
+
+ defOptions, err := storage.GetMountOptions(c.runtime.store.GraphDriverName(), c.runtime.store.GraphOptions())
if err != nil {
return errors.Wrapf(err, "error getting default mount options")
}