summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-01-20 00:57:26 -0500
committerGitHub <noreply@github.com>2022-01-20 00:57:26 -0500
commitf46478c1e9af601759e341de76d4c655b4a66068 (patch)
treee36dfe4cc42a2f458425bf0188b1e6b66b7ab784
parent7fc8bf4a428c08fcb9c9e97d238628319a20986e (diff)
parent7046e7804009c58b37d04eeb63ced7cc46b69875 (diff)
downloadpodman-f46478c1e9af601759e341de76d4c655b4a66068.tar.gz
podman-f46478c1e9af601759e341de76d4c655b4a66068.tar.bz2
podman-f46478c1e9af601759e341de76d4c655b4a66068.zip
Merge pull request #12931 from giuseppe/fix-crash-with-bazel-linux-sandbox
rootless: report correctly the error
-rw-r--r--pkg/rootless/rootless_linux.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
index 22f5041d0..a0b6edcfb 100644
--- a/pkg/rootless/rootless_linux.go
+++ b/pkg/rootless/rootless_linux.go
@@ -390,11 +390,11 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (_ boo
return joinUserAndMountNS(uint(pid), "")
}
}
- return false, -1, errors.Wrapf(err, "error setting up the process")
+ return false, -1, errors.New("error setting up the process")
}
if b[0] != '0' {
- return false, -1, errors.Wrapf(err, "error setting up the process")
+ return false, -1, errors.New("error setting up the process")
}
signals := []os.Signal{}