opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 00:56:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move libpod under containers/storage

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #65
Approved by: mheon
This commit is contained in:
Daniel J Walsh
2017-11-29 17:58:42 +00:00
committed by Atomic Bot
parent 13e833a388
commit cefa782e50
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/options.go
View File

@ -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)

2
libpod/runtime.go
View File

@ -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,