diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2017-11-01 17:09:33 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2017-11-02 15:30:26 -0400 |
| commit | 83b55c47717787766a5bd162840d494798f38952 (patch) | |
| tree | 614c4f212d117ffd8fd5f3c1e5277867892c9e50 | |
| parent | 10006e787ee246db0d03065c523ac2477208e7f8 (diff) | |
| download | podman-83b55c47717787766a5bd162840d494798f38952.tar.gz podman-83b55c47717787766a5bd162840d494798f38952.tar.bz2 podman-83b55c47717787766a5bd162840d494798f38952.zip | |
-mFix crioConfigPath
I don't believe this should be in here, but for now we need to make it not global
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| -rw-r--r-- | cmd/kpod/common.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/kpod/common.go b/cmd/kpod/common.go index 24f20f7ed..8bd63b338 100644 --- a/cmd/kpod/common.go +++ b/cmd/kpod/common.go @@ -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 |