summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2017-12-14 14:36:27 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2017-12-14 23:59:22 +0000
commit1f0f7f3e7d4766437f5ac2008d1dcf00686477c9 (patch)
treecf939a98b0962b9e64c1fa31eaf474c6c6c4e812 /cmd
parent7981b7636b97c840c6913c11544aaac878deb3da (diff)
downloadpodman-1f0f7f3e7d4766437f5ac2008d1dcf00686477c9.tar.gz
podman-1f0f7f3e7d4766437f5ac2008d1dcf00686477c9.tar.bz2
podman-1f0f7f3e7d4766437f5ac2008d1dcf00686477c9.zip
Ensure libkpod.Config defaults don't override libpod defaults
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #109 Approved by: mheon
Diffstat (limited to 'cmd')
-rw-r--r--cmd/kpod/common.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/kpod/common.go b/cmd/kpod/common.go
index 774215479..046ea4509 100644
--- a/cmd/kpod/common.go
+++ b/cmd/kpod/common.go
@@ -50,7 +50,7 @@ func getRuntime(c *cli.Context) (*libpod.Runtime, error) {
options.GraphDriverName = config.Storage
options.GraphDriverOptions = config.StorageOptions
- return libpod.NewRuntime(libpod.WithStorageConfig(options), libpod.WithConmonPath(config.Conmon), libpod.WithOCIRuntime(config.Runtime), libpod.WithCNIDirs(config.NetworkDir, config.PluginDir))
+ return libpod.NewRuntime(libpod.WithStorageConfig(options), libpod.WithConmonPath(config.Conmon), libpod.WithOCIRuntime(config.Runtime), libpod.WithCNIConfigDir(config.NetworkDir))
}
func shutdownStores() {