diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-19 10:01:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 10:01:02 -0500 |
| commit | 1c81b67341300853d7fe9b6568b247e579c34969 (patch) | |
| tree | 4b3f236c3b632187eddfbc89c89b8d9a04ea3e4c /vendor/github.com/opencontainers/runc/libcontainer/utils/utils_unix.go | |
| parent | 8301a7cd828c4576c1e581cb2dd376f42a363a11 (diff) | |
| parent | a0165a64b9efc3201bda69e4271ecf0f149bc59c (diff) | |
| download | podman-1c81b67341300853d7fe9b6568b247e579c34969.tar.gz podman-1c81b67341300853d7fe9b6568b247e579c34969.tar.bz2 podman-1c81b67341300853d7fe9b6568b247e579c34969.zip | |
Merge pull request #12921 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.go | 5 |
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 |