diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-20 14:58:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-20 14:58:13 +0100 |
commit | 11a1c23ab341d6d4726a2ba6dca522642dda9034 (patch) | |
tree | 5a3ee115c3aa7cf7ac47fae9b5d4b25c00a07a82 /cmd | |
parent | 3b88c7350726f5a019f989a1ab7e5046917f2f79 (diff) | |
parent | 5642472c4956b87d38e75ce05b348b708fbf932f (diff) | |
download | podman-11a1c23ab341d6d4726a2ba6dca522642dda9034.tar.gz podman-11a1c23ab341d6d4726a2ba6dca522642dda9034.tar.bz2 podman-11a1c23ab341d6d4726a2ba6dca522642dda9034.zip |
Merge pull request #2374 from mheon/rootless_recursive_start
Ensure that userns is created for stopped rootless pods
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/podman/create.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go index 216f171a8..12b793d23 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -868,6 +868,12 @@ func joinOrCreateRootlessUserNamespace(createConfig *cc.CreateConfig, runtime *l if err != nil { 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)) } } |