summaryrefslogtreecommitdiff
path: root/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-01-18 10:04:10 -0500
committerGitHub <noreply@github.com>2022-01-18 10:04:10 -0500
commit55ad6188b067ba6594819c318dd2ae92dea2f27e (patch)
treeba30a34e670229237efc607502802848ef3b3d77 /vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go
parent59b1cdf9bb1c97475f369c0ca2b27ce2eaa1a0d4 (diff)
parent4adf457ff3619fd8b99f025c5ea67b7dac96fea8 (diff)
downloadpodman-55ad6188b067ba6594819c318dd2ae92dea2f27e.tar.gz
podman-55ad6188b067ba6594819c318dd2ae92dea2f27e.tar.bz2
podman-55ad6188b067ba6594819c318dd2ae92dea2f27e.zip
Merge pull request #12900 from containers/dependabot/go_modules/github.com/opencontainers/runc-1.1.0
Bump github.com/opencontainers/runc from 1.0.3 to 1.1.0
Diffstat (limited to 'vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go')
-rw-r--r--vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go
index 1576f2d4a..220d0b439 100644
--- a/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go
+++ b/vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go
@@ -1,3 +1,4 @@
+//go:build !windows
// +build !windows
package utils
@@ -14,7 +15,7 @@ import (
func EnsureProcHandle(fh *os.File) error {
var buf unix.Statfs_t
if err := unix.Fstatfs(int(fh.Fd()), &buf); err != nil {
- return fmt.Errorf("ensure %s is on procfs: %v", fh.Name(), err)
+ return fmt.Errorf("ensure %s is on procfs: %w", fh.Name(), err)
}
if buf.Type != unix.PROC_SUPER_MAGIC {
return fmt.Errorf("%s is not on procfs", fh.Name())
@@ -52,7 +53,7 @@ func CloseExecFrom(minFd int) error {
// Intentionally ignore errors from unix.CloseOnExec -- the cases where
// this might fail are basically file descriptors that have already
// been closed (including and especially the one that was created when
- // ioutil.ReadDir did the "opendir" syscall).
+ // os.ReadDir did the "opendir" syscall).
unix.CloseOnExec(fd)
}
return nil