diff options
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/options.go | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libpod/options.go b/libpod/options.go index 661bd8d91..4a3d30cfe 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -37,6 +37,11 @@ func WithStorageConfig(config storage.StoreOptions) RuntimeOption { if config.GraphRoot != "" { rt.config.StorageConfig.GraphRoot = config.GraphRoot 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 != "" { @@ -44,13 +49,6 @@ func WithStorageConfig(config storage.StoreOptions) RuntimeOption { 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 { rt.config.StorageConfig.GraphDriverOptions = make([]string, len(config.GraphDriverOptions)) copy(rt.config.StorageConfig.GraphDriverOptions, config.GraphDriverOptions) |