containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix libpod static dir selection when graphroot changed 

When graphroot is set by the user, we should set libpod's static
directory to a subdirectory of that by default, to duplicate
previous behavior.

Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon 2018-12-03 15:13:07 -05:00
parent 677c444463
commit 7c575bdce2
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libpod/options.go
View File

@ -37,6 +37,11 @@ func WithStorageConfig(config storage.StoreOptions) RuntimeOption {
if config.GraphRoot != "" { if config.GraphRoot != "" {
rt.config.StorageConfig.GraphRoot = config.GraphRoot rt.config.StorageConfig.GraphRoot = config.GraphRoot
rt.configuredFrom.storageGraphRootSet = true rt.configuredFrom.storageGraphRootSet = true
// Also set libpod static dir, so we are a subdirectory
// of the c/storage store by default
rt.config.StaticDir = filepath.Join(config.GraphRoot, "libpod")
rt.configuredFrom.libpodStaticDirSet = true
} }
if config.GraphDriverName != "" { if config.GraphDriverName != "" {
@ -44,13 +49,6 @@ func WithStorageConfig(config storage.StoreOptions) RuntimeOption {
rt.configuredFrom.storageGraphDriverSet = true rt.configuredFrom.storageGraphDriverSet = true
} }
// Only set our static dir if it was not already explicitly
// overridden
if config.GraphRoot != "" && !rt.configuredFrom.libpodStaticDirSet {
rt.config.StaticDir = filepath.Join(config.GraphRoot, "libpod")
rt.configuredFrom.libpodStaticDirSet = true
}
if config.GraphDriverOptions != nil { if config.GraphDriverOptions != nil {
rt.config.StorageConfig.GraphDriverOptions = make([]string, len(config.GraphDriverOptions)) rt.config.StorageConfig.GraphDriverOptions = make([]string, len(config.GraphDriverOptions))
copy(rt.config.StorageConfig.GraphDriverOptions, config.GraphDriverOptions) copy(rt.config.StorageConfig.GraphDriverOptions, config.GraphDriverOptions)