Move libpod under containers/storage

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #65 Approved by: mheon
containers · Nov 29, 2017 · cefa782 · cefa782
1 parent 13e833a
commit cefa782
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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,