summaryrefslogtreecommitdiff
path: root/cmd/kpod/common.go
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2017-11-01 13:22:04 -0400
committerMatthew Heon <matthew.heon@gmail.com>2017-11-01 13:22:04 -0400
commitc13f61798aa7bcf7b4de7ee31aa30148a3b08d97 (patch)
tree6f0c3297f91ecbe259d8dc5ff1b0ab3d63e44744 /cmd/kpod/common.go
parent92b31c0ff7c75fab3b875fb6b10c14f8e2c031e7 (diff)
downloadpodman-c13f61798aa7bcf7b4de7ee31aa30148a3b08d97.tar.gz
podman-c13f61798aa7bcf7b4de7ee31aa30148a3b08d97.tar.bz2
podman-c13f61798aa7bcf7b4de7ee31aa30148a3b08d97.zip
Prune Server package. Convert to new github location.
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Diffstat (limited to 'cmd/kpod/common.go')
-rw-r--r--cmd/kpod/common.go11
1 files changed, 6 insertions, 5 deletions
diff --git a/cmd/kpod/common.go b/cmd/kpod/common.go
index f77b3fd1e..338aee8ea 100644
--- a/cmd/kpod/common.go
+++ b/cmd/kpod/common.go
@@ -9,9 +9,8 @@ import (
is "github.com/containers/image/storage"
"github.com/containers/storage"
"github.com/fatih/camelcase"
- "github.com/kubernetes-incubator/cri-o/libkpod"
- "github.com/kubernetes-incubator/cri-o/libpod"
- "github.com/kubernetes-incubator/cri-o/server"
+ "github.com/projectatomic/libpod/libkpod"
+ "github.com/projectatomic/libpod/libpod"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
@@ -20,6 +19,8 @@ var (
stores = make(map[storage.Store]struct{})
)
+const CrioConfigPath = "/etc/crio/crio.conf"
+
func getStore(c *libkpod.Config) (storage.Store, error) {
options := storage.DefaultStoreOptions
options.GraphRoot = c.Root
@@ -65,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(server.CrioConfigPath); err == nil {
- configFile = server.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