From 83b55c47717787766a5bd162840d494798f38952 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 1 Nov 2017 17:09:33 -0400 Subject: -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 --- cmd/kpod/common.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cmd') 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 -- cgit v1.2.3-54-g00ecf