From 7c575bdce26b0cc5560bb5a8fe5ac680c2843903 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 3 Dec 2018 15:13:07 -0500 Subject: 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 --- libpod/options.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'libpod') 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) -- cgit v1.2.3-54-g00ecf