summaryrefslogtreecommitdiff
path: root/pkg/rootless
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-02-25 21:16:26 +0100
committerGitHub <noreply@github.com>2020-02-25 21:16:26 +0100
commit6a03a9a538804b406c34e75a2333045b9f7db7d5 (patch)
treeadf5a5fc6f4cbcd6e243224a7f58f3de6dd7062c /pkg/rootless
parent72fdccda7ac998efb8e88cc5914c70cfecb785dd (diff)
parent6dbb89e56c476d41ef63ad828ebdc549ce276c85 (diff)
downloadpodman-6a03a9a538804b406c34e75a2333045b9f7db7d5.tar.gz
podman-6a03a9a538804b406c34e75a2333045b9f7db7d5.tar.bz2
podman-6a03a9a538804b406c34e75a2333045b9f7db7d5.zip
Merge pull request #5324 from giuseppe/fix-running-no-pause
rootless: raise error if the process is not found
Diffstat (limited to 'pkg/rootless')
-rw-r--r--pkg/rootless/rootless_linux.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
index f71d55776..5ddfab7ad 100644
--- a/pkg/rootless/rootless_linux.go
+++ b/pkg/rootless/rootless_linux.go
@@ -510,7 +510,7 @@ func TryJoinFromFilePaths(pausePidPath string, needNewNamespace bool, paths []st
}
}
}
- if !foundProcess {
+ if !foundProcess && pausePidPath != "" {
return BecomeRootInUserNS(pausePidPath)
}
if lastErr != nil {