opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-22 01:27:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

[NO TESTS NEEDED] Fix for kernel without CONFIG_USER_NS

Browse Source 
Signed-off-by: Natsuki <i@ntk.me>
This commit is contained in:
なつき
2021-03-26 13:25:58 -07:00
parent 4d0b583340
commit a2e834d0d9
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libpod/container_internal_linux.go
View File

@ -607,10 +607,16 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) {
availableUIDs, availableGIDs, err := rootless.GetAvailableIDMaps() availableUIDs, availableGIDs, err := rootless.GetAvailableIDMaps()
if err != nil { if err != nil {
return nil, err if os.IsNotExist(err) {
// The kernel-provided files only exist if user namespaces are supported
logrus.Debugf("user or group ID mappings not available: %s", err)
} else {
return nil, err
}
} else {
g.Config.Linux.UIDMappings = rootless.MaybeSplitMappings(g.Config.Linux.UIDMappings, availableUIDs)
g.Config.Linux.GIDMappings = rootless.MaybeSplitMappings(g.Config.Linux.GIDMappings, availableGIDs)
} }
g.Config.Linux.UIDMappings = rootless.MaybeSplitMappings(g.Config.Linux.UIDMappings, availableUIDs)
g.Config.Linux.GIDMappings = rootless.MaybeSplitMappings(g.Config.Linux.GIDMappings, availableGIDs)
// Hostname handling: // Hostname handling:
// If we have a UTS namespace, set Hostname in the OCI spec. // If we have a UTS namespace, set Hostname in the OCI spec.