diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-07-27 07:21:47 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-07-27 13:07:19 +0000 |
| commit | 02e7efc2b35da65cb4e27b0d58923d6c7b3a1c6c (patch) | |
| tree | cbb0d236dc3fe4c83874389ec521b1424b571b24 /vendor/github.com/opencontainers/runc/libcontainer/devices/devices.go | |
| parent | 876a30590b93757ca16ee607dee4f4458983620c (diff) | |
| download | podman-02e7efc2b35da65cb4e27b0d58923d6c7b3a1c6c.tar.gz podman-02e7efc2b35da65cb4e27b0d58923d6c7b3a1c6c.tar.bz2 podman-02e7efc2b35da65cb4e27b0d58923d6c7b3a1c6c.zip | |
Update vendored version of runc,buildah,containers/image
There is a compiler warning that has been fixed in the
upstream, so I figured we should update to fix.
Also vendor in latest buildah to get better support for running builds in rootless
mode.
Vendor in latest containers/image to allow daemon support to be pluggable.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1169
Approved by: mheon
Diffstat (limited to 'vendor/github.com/opencontainers/runc/libcontainer/devices/devices.go')
| -rw-r--r-- | vendor/github.com/opencontainers/runc/libcontainer/devices/devices.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/devices/devices.go b/vendor/github.com/opencontainers/runc/libcontainer/devices/devices.go index 361925890..5e2ab0581 100644 --- a/vendor/github.com/opencontainers/runc/libcontainer/devices/devices.go +++ b/vendor/github.com/opencontainers/runc/libcontainer/devices/devices.go @@ -30,8 +30,9 @@ func DeviceFromPath(path, permissions string) (*configs.Device, error) { } var ( - devNumber = stat.Rdev + devNumber = uint64(stat.Rdev) major = unix.Major(devNumber) + minor = unix.Minor(devNumber) ) if major == 0 { return nil, ErrNotADevice @@ -51,7 +52,7 @@ func DeviceFromPath(path, permissions string) (*configs.Device, error) { Type: devType, Path: path, Major: int64(major), - Minor: int64(unix.Minor(devNumber)), + Minor: int64(minor), Permissions: permissions, FileMode: os.FileMode(mode), Uid: stat.Uid, |