diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2019-01-05 07:30:03 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2019-01-05 07:37:21 -0500 |
| commit | a76256834a0a409dfb53943e04fd2458c7782361 (patch) | |
| tree | fbfb8d1e16dd669793e6804a37d85e8a7918ad74 /libpod/lock/shm | |
| parent | 4e0c0ecbc383531cd1b38db9027583974a72070d (diff) | |
| download | podman-a76256834a0a409dfb53943e04fd2458c7782361.tar.gz podman-a76256834a0a409dfb53943e04fd2458c7782361.tar.bz2 podman-a76256834a0a409dfb53943e04fd2458c7782361.zip | |
Rootless with shmlocks was not working.
This patch makes the path unigue to each UID.
Also cleans up some return code to return the path it is trying to lock.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'libpod/lock/shm')
| -rw-r--r-- | libpod/lock/shm/shm_lock.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/lock/shm/shm_lock.go b/libpod/lock/shm/shm_lock.go index 3372a8c71..be5e5148f 100644 --- a/libpod/lock/shm/shm_lock.go +++ b/libpod/lock/shm/shm_lock.go @@ -48,7 +48,7 @@ func CreateSHMLock(path string, numLocks uint32) (*SHMLocks, error) { lockStruct := C.setup_lock_shm(cPath, C.uint32_t(numLocks), &errCode) if lockStruct == nil { // We got a null pointer, so something errored - return nil, syscall.Errno(-1 * errCode) + return nil, errors.Wrapf(syscall.Errno(-1*errCode), "failed to create %d locks in %s", numLocks, path) } locks.lockStruct = lockStruct @@ -77,7 +77,7 @@ func OpenSHMLock(path string, numLocks uint32) (*SHMLocks, error) { lockStruct := C.open_lock_shm(cPath, C.uint32_t(numLocks), &errCode) if lockStruct == nil { // We got a null pointer, so something errored - return nil, syscall.Errno(-1 * errCode) + return nil, errors.Wrapf(syscall.Errno(-1*errCode), "failed to open %d locks in %s", numLocks, path) } locks.lockStruct = lockStruct |