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

Merge pull request #2374 from mheon/rootless_recursive_start 

Ensure that userns is created for stopped rootless pods
This commit is contained in:
OpenShift Merge Robot 2019-02-20 14:58:13 +01:00 committed by GitHub
parent 3b88c73507 5642472c49
commit 11a1c23ab3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/podman/create.go
View File

@ -868,6 +868,12 @@ func joinOrCreateRootlessUserNamespace(createConfig *cc.CreateConfig, runtime *l
if err != nil { if err != nil {
return false, -1, err return false, -1, err
} }
if pid == 0 {
if createConfig.Pod != "" {
continue
}
return false, -1, errors.Errorf("dependency container %s is not running", ctr.ID())
}
return rootless.JoinNS(uint(pid)) return rootless.JoinNS(uint(pid))
} }
} }