containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime: fill a proper default tmpdir when --config is used 

Closes: https://github.com/containers/libpod/issues/2408

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2019-03-04 10:35:01 +01:00
parent f3a3d8e28e
commit 9bf8bd7bcb
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/runtime.go
View File

@ -477,6 +477,12 @@ func NewRuntimeFromConfig(configPath string, options ...RuntimeOption) (runtime
runtime.config.OCIRuntime = defaultRuntimeConfig.OCIRuntime runtime.config.OCIRuntime = defaultRuntimeConfig.OCIRuntime
runtime.config.StorageConfig = storage.StoreOptions{} runtime.config.StorageConfig = storage.StoreOptions{}
tmpDir, err := getDefaultTmpDir()
if err != nil {
return nil, err
}
runtime.config.TmpDir = tmpDir
// Check to see if the given configuration file exists // Check to see if the given configuration file exists
if _, err := os.Stat(configPath); err != nil { if _, err := os.Stat(configPath); err != nil {
return nil, errors.Wrapf(err, "error checking existence of configuration file %s", configPath) return nil, errors.Wrapf(err, "error checking existence of configuration file %s", configPath)