summaryrefslogtreecommitdiff
path: root/libpod/runtime.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-05-08 08:37:14 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-05-08 09:27:39 -0400
commit5cbb0b8a665eb28b5b47212d35a6204d2be202fb (patch)
tree1e9fafe7376d8811f01d4ca6838005614249429d /libpod/runtime.go
parentff1c59065e9d2ef0c03ce8de444b489630d00b3c (diff)
downloadpodman-5cbb0b8a665eb28b5b47212d35a6204d2be202fb.tar.gz
podman-5cbb0b8a665eb28b5b47212d35a6204d2be202fb.tar.bz2
podman-5cbb0b8a665eb28b5b47212d35a6204d2be202fb.zip
Fix handling of overridden paths from database
If the first time you run podman in a user account you do a su - USER, and the second time, you run as the logged in USER podman fails, because it is not handling the tmpdir definition in the database. This PR fixes this problem. vendor containers/common v0.11.1 This should fix a couple of issues we have seen in podman 1.9.1 with handling of libpod.conf. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'libpod/runtime.go')
-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 != "" {