diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2017-11-29 17:58:42 +0000 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-11-29 20:40:50 +0000 |
| commit | cefa782e5067515bc38b5b3688d53f4fd9d0c70b (patch) | |
| tree | 1f0ee1f05a9f1d3933647186b7dbf8df49ab87fd | |
| parent | 13e833a3884a22ac303b6f97a59cbeef16950243 (diff) | |
| download | podman-cefa782e5067515bc38b5b3688d53f4fd9d0c70b.tar.gz podman-cefa782e5067515bc38b5b3688d53f4fd9d0c70b.tar.bz2 podman-cefa782e5067515bc38b5b3688d53f4fd9d0c70b.zip | |
Move libpod under containers/storage
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #65
Approved by: mheon
| -rw-r--r-- | libpod/options.go | 2 | ||||
| -rw-r--r-- | libpod/runtime.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libpod/options.go b/libpod/options.go index 4c21a70c9..59141115d 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -2,6 +2,7 @@ package libpod import ( "fmt" + "path/filepath" "github.com/containers/storage" "github.com/containers/storage/pkg/idtools" @@ -43,6 +44,7 @@ func WithStorageConfig(config storage.StoreOptions) RuntimeOption { rt.config.StorageConfig.RunRoot = config.RunRoot rt.config.StorageConfig.GraphRoot = config.GraphRoot rt.config.StorageConfig.GraphDriverName = config.GraphDriverName + rt.config.StaticDir = filepath.Join(config.GraphRoot, "libpod") rt.config.StorageConfig.GraphDriverOptions = make([]string, len(config.GraphDriverOptions)) copy(rt.config.StorageConfig.GraphDriverOptions, config.GraphDriverOptions) diff --git a/libpod/runtime.go b/libpod/runtime.go index 1a18b7e8e..4a45bf008 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -61,7 +61,7 @@ var ( "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", }, CgroupManager: "cgroupfs", - StaticDir: "/var/lib/libpod", + StaticDir: filepath.Join(storage.DefaultStoreOptions.GraphRoot, "libpod"), TmpDir: "/var/run/libpod", SelinuxEnabled: false, PidsLimit: 1024, |