summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-08 17:41:48 +0200
committerGitHub <noreply@github.com>2020-05-08 17:41:48 +0200
commit2547fe53127057ce8f3ba065b4263fea32be7f0d (patch)
treeee2a6e1a9d8dc186d49a825621e2ac9cd3e06544 /libpod
parentfa7589b6a6a513b7449b59535221aaee809cb239 (diff)
parent5cbb0b8a665eb28b5b47212d35a6204d2be202fb (diff)
downloadpodman-2547fe53127057ce8f3ba065b4263fea32be7f0d.tar.gz
podman-2547fe53127057ce8f3ba065b4263fea32be7f0d.tar.bz2
podman-2547fe53127057ce8f3ba065b4263fea32be7f0d.zip
Merge pull request #6137 from rhatdan/VENDOR
Fix handling of overridden paths from database
Diffstat (limited to 'libpod')
-rw-r--r--libpod/runtime.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go
index e71483ef9..c1864683f 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -752,7 +752,7 @@ type DBConfig struct {
// mergeDBConfig merges the configuration from the database.
func (r *Runtime) mergeDBConfig(dbConfig *DBConfig) error {
- c := r.config.Engine
+ c := &r.config.Engine
if !r.storageSet.RunRootSet && dbConfig.StorageTmp != "" {
if r.storageConfig.RunRoot != dbConfig.StorageTmp &&
r.storageConfig.RunRoot != "" {