opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-19 07:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of overridden paths from database

Browse Source 
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>
This commit is contained in:
Daniel J Walsh
2020-05-08 08:37:14 -04:00
parent ff1c59065e
commit 5cbb0b8a66
16 changed files with 220 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vendor/github.com/containers/common/pkg/config/config.go generated vendored
View File

@@ -442,16 +442,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
}