mirror/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2026-03-16 05:40:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9835 from ntkme/check-userns-support

Browse Source 
[NO TESTS NEEDED] Fix for kernel without CONFIG_USER_NS
This commit is contained in:
OpenShift Merge Robot
2021-03-27 09:27:47 +00:00
committed by GitHub
parent 4d0b583340 a2e834d0d9
commit 5afcaeeaef
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()
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:
// If we have a UTS namespace, set Hostname in the OCI spec.