opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

rootless: drop function ReadMappingsProc

Browse Source 
use the equivalent GetHostIDMappings from the storage unshare package.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2024-04-10 11:54:21 +02:00
parent b59993ce09
commit aee1e1408d
5 changed files with 16 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/util/utils.go
View File

@ -26,6 +26,7 @@ import (
"github.com/containers/podman/v5/pkg/signal"
"github.com/containers/storage/pkg/directory"
"github.com/containers/storage/pkg/idtools"
"github.com/containers/storage/pkg/unshare"
stypes "github.com/containers/storage/types"
securejoin "github.com/cyphar/filepath-securejoin"
ruser "github.com/moby/sys/user"
@ -221,16 +222,12 @@ func GetKeepIDMapping(opts *namespaces.KeepIDUserNsOptions) (*stypes.IDMappingOp
HostUIDMapping: false,
HostGIDMapping: false,
}
uids, err := rootless.ReadMappingsProc("/proc/self/uid_map")
uids, gids, err := unshare.GetHostIDMappings("")
if err != nil {
return nil, 0, 0, err
}
gids, err := rootless.ReadMappingsProc("/proc/self/gid_map")
if err != nil {
return nil, 0, 0, err
}
options.UIDMap = uids
options.GIDMap = gids
options.UIDMap = RuntimeSpecToIDtools(uids)
options.GIDMap = RuntimeSpecToIDtools(gids)
uid, gid := 0, 0
if opts.UID != nil {