summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-01-12 10:08:13 -0800
committerGitHub <noreply@github.com>2019-01-12 10:08:13 -0800
commit9493be69b3fd1d4ed8631655704d376a66ebf86b (patch)
tree6069065b27b3199eb0348172876202f7df0c8b4d
parenta08da3768255c1155aa14b73bf17d34e5214c568 (diff)
parent634236ae70583217f42a31ee5a42633310557fcc (diff)
downloadpodman-9493be69b3fd1d4ed8631655704d376a66ebf86b.tar.gz
podman-9493be69b3fd1d4ed8631655704d376a66ebf86b.tar.bz2
podman-9493be69b3fd1d4ed8631655704d376a66ebf86b.zip
Merge pull request #2148 from rhatdan/storage-opt
Set default storage options from mounts.conf file.
-rw-r--r--cmd/podman/libpodruntime/runtime.go6
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?