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

Merge pull request #8163 from giuseppe/clean-path

Browse Source 
libpod: clean paths before check
This commit is contained in:
OpenShift Merge Robot
2020-10-29 03:31:19 -04:00
committed by GitHub
parent 464aa36b0c 6ad768852a
commit cce6c6cd40
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libpod/boltdb_state_internal.go
View File

@ -3,6 +3,7 @@ package libpod
import ( import (
"bytes" "bytes"
"os" "os"
"path/filepath"
"runtime" "runtime"
"strings" "strings"
@ -104,25 +105,25 @@ func checkRuntimeConfig(db *bolt.DB, rt *Runtime) error {
}, },
{ {
"libpod root directory (staticdir)", "libpod root directory (staticdir)",
rt.config.Engine.StaticDir, filepath.Clean(rt.config.Engine.StaticDir),
staticDirKey, staticDirKey,
"", "",
}, },
{ {
"libpod temporary files directory (tmpdir)", "libpod temporary files directory (tmpdir)",
rt.config.Engine.TmpDir, filepath.Clean(rt.config.Engine.TmpDir),
tmpDirKey, tmpDirKey,
"", "",
}, },
{ {
"storage temporary directory (runroot)", "storage temporary directory (runroot)",
rt.StorageConfig().RunRoot, filepath.Clean(rt.StorageConfig().RunRoot),
runRootKey, runRootKey,
storeOpts.RunRoot, storeOpts.RunRoot,
}, },
{ {
"storage graph root directory (graphroot)", "storage graph root directory (graphroot)",
rt.StorageConfig().GraphRoot, filepath.Clean(rt.StorageConfig().GraphRoot),
graphRootKey, graphRootKey,
storeOpts.GraphRoot, storeOpts.GraphRoot,
}, },