summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorなつき <i@ntk.me>2021-03-26 13:25:58 -0700
committerなつき <i@ntk.me>2021-03-26 21:03:24 -0700
commita2e834d0d9090091211f456a0279221c0aa7f12e (patch)
tree32f43408cf6cd67573defbf0cbc39b0bd48e20d2
parent4d0b583340c37efbf175c00d75d75107a0b23f00 (diff)
downloadpodman-a2e834d0d9090091211f456a0279221c0aa7f12e.tar.gz
podman-a2e834d0d9090091211f456a0279221c0aa7f12e.tar.bz2
podman-a2e834d0d9090091211f456a0279221c0aa7f12e.zip
[NO TESTS NEEDED] Fix for kernel without CONFIG_USER_NS
Signed-off-by: Natsuki <i@ntk.me>
-rw-r--r--libpod/container_internal_linux.go12
1 files changed, 9 insertions, 3 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 94c6c3840..a136fb72d 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -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.