diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2017-11-02 19:35:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-02 19:35:33 -0400 |
| commit | 7bb1d240281e95aeb5eb5f761823e766d2804683 (patch) | |
| tree | c03a19ce82df57651218a0133d571c7887ce8b88 /cmd/kpod/common.go | |
| parent | f0f5b51ff27d8eec790f2d5fc12c28c536149bb7 (diff) | |
| parent | 6e37df18ef4e2750e954bf64f7dc46d57dcade3a (diff) | |
| download | podman-7bb1d240281e95aeb5eb5f761823e766d2804683.tar.gz podman-7bb1d240281e95aeb5eb5f761823e766d2804683.tar.bz2 podman-7bb1d240281e95aeb5eb5f761823e766d2804683.zip | |
Merge pull request #6 from rhatdan/papr
Add Papr support
Diffstat (limited to 'cmd/kpod/common.go')
| -rw-r--r-- | cmd/kpod/common.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/kpod/common.go b/cmd/kpod/common.go index 24f20f7ed..d924f17a3 100644 --- a/cmd/kpod/common.go +++ b/cmd/kpod/common.go @@ -9,9 +9,9 @@ import ( is "github.com/containers/image/storage" "github.com/containers/storage" "github.com/fatih/camelcase" + "github.com/pkg/errors" "github.com/projectatomic/libpod/libkpod" "github.com/projectatomic/libpod/libpod" - "github.com/pkg/errors" "github.com/urfave/cli" ) @@ -19,7 +19,7 @@ var ( stores = make(map[storage.Store]struct{}) ) -const CrioConfigPath = "/etc/crio/crio.conf" +const crioConfigPath = "/etc/crio/crio.conf" func getStore(c *libkpod.Config) (storage.Store, error) { options := storage.DefaultStoreOptions @@ -66,8 +66,8 @@ func getConfig(c *cli.Context) (*libkpod.Config, error) { var configFile string if c.GlobalIsSet("config") { configFile = c.GlobalString("config") - } else if _, err := os.Stat(CrioConfigPath); err == nil { - configFile = CrioConfigPath + } else if _, err := os.Stat(crioConfigPath); err == nil { + configFile = crioConfigPath } // load and merge the configfile from the commandline or use // the default crio config file |