From cb7b97ce5ed30bbe1239d2bcbc1be282ba56ed9e Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 7 May 2020 18:02:00 -0400 Subject: Fix handling of overridden paths from database Signed-off-by: Daniel J Walsh --- vendor/github.com/containers/common/pkg/config/config.go | 10 ---------- vendor/modules.txt | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'vendor') diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go index b65db2722..aa956da04 100644 --- a/vendor/github.com/containers/common/pkg/config/config.go +++ b/vendor/github.com/containers/common/pkg/config/config.go @@ -435,16 +435,6 @@ func readConfigFromFile(path string, config *Config) (*Config, error) { if err != nil { return nil, fmt.Errorf("unable to decode configuration %v: %v", path, err) } - if config.Engine.VolumePath != "" { - config.Engine.VolumePathSet = true - } - if config.Engine.StaticDir != "" { - config.Engine.StaticDirSet = true - } - if config.Engine.TmpDir != "" { - config.Engine.TmpDirSet = true - } - return config, err } diff --git a/vendor/modules.txt b/vendor/modules.txt index 0c0b07b12..80c968ba4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -82,7 +82,7 @@ github.com/containers/buildah/pkg/secrets github.com/containers/buildah/pkg/supplemented github.com/containers/buildah/pkg/umask github.com/containers/buildah/util -# github.com/containers/common v0.8.2 +# github.com/containers/common v0.8.3 github.com/containers/common/pkg/apparmor github.com/containers/common/pkg/capabilities github.com/containers/common/pkg/cgroupv2 -- cgit v1.2.3-54-g00ecf