diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2019-01-12 06:29:17 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2019-01-12 06:55:03 -0500 |
| commit | 634236ae70583217f42a31ee5a42633310557fcc (patch) | |
| tree | 35942e9c1b2b3918a2a3d49b1a101d8cbc8b3977 | |
| parent | 5c86efb28976938ad77fcc0f677e0842d06b65b5 (diff) | |
| download | podman-634236ae70583217f42a31ee5a42633310557fcc.tar.gz podman-634236ae70583217f42a31ee5a42633310557fcc.tar.bz2 podman-634236ae70583217f42a31ee5a42633310557fcc.zip | |
Set default storage options from mounts.conf file.
We were never loading the storage.conf file to grab mountOptions.
This is causing us to not use metacopyup option when running with
overlay.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| -rw-r--r-- | cmd/podman/libpodruntime/runtime.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go index d7a0dd931..dca2f5022 100644 --- a/cmd/podman/libpodruntime/runtime.go +++ b/cmd/podman/libpodruntime/runtime.go @@ -4,17 +4,15 @@ import ( "github.com/containers/libpod/libpod" "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/pkg/util" - "github.com/containers/storage" "github.com/pkg/errors" "github.com/urfave/cli" ) // GetRuntime generates a new libpod runtime configured by command line options func GetRuntime(c *cli.Context) (*libpod.Runtime, error) { - storageOpts := new(storage.StoreOptions) options := []libpod.RuntimeOption{} - _, volumePath, err := util.GetDefaultStoreOptions() + storageOpts, volumePath, err := util.GetDefaultStoreOptions() if err != nil { return nil, err } @@ -44,7 +42,7 @@ func GetRuntime(c *cli.Context) (*libpod.Runtime, error) { storageOpts.GraphDriverOptions = c.GlobalStringSlice("storage-opt") } - options = append(options, libpod.WithStorageConfig(*storageOpts)) + options = append(options, libpod.WithStorageConfig(storageOpts)) // TODO CLI flags for image config? // TODO CLI flag for signature policy? |