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

Merge pull request #11523 from Luap99/e2e-warning 

try to create the runroot before we warn that it is not writable
This commit is contained in:
OpenShift Merge Robot 2021-09-10 09:15:46 -04:00 committed by GitHub
parent 63f6656f8f 8d638d502b
commit 580ac4c6ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libpod/runtime.go
View File

@ -335,8 +335,16 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
// If user is rootless and XDG_RUNTIME_DIR is found, podman will not proceed with /tmp directory
// it will try to use existing XDG_RUNTIME_DIR
// if current user has no write access to XDG_RUNTIME_DIR we will fail later
if unix.Access(runtime.storageConfig.RunRoot, unix.W_OK) != nil {
logrus.Warnf("XDG_RUNTIME_DIR is pointing to a path which is not writable. Most likely podman will fail.")
if err := unix.Access(runtime.storageConfig.RunRoot, unix.W_OK); err != nil {
msg := "XDG_RUNTIME_DIR is pointing to a path which is not writable. Most likely podman will fail."
if errors.Is(err, os.ErrNotExist) {
// if dir does not exists try to create it
if err := os.MkdirAll(runtime.storageConfig.RunRoot, 0700); err != nil {
logrus.Warn(msg)
}
} else {
logrus.Warn(msg)
}
}
}