1 files changed, 18 insertions, 0 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go
index 7faf13465..6b2e90b22 100644
--- a/pkg/specgen/generate/container_create.go
+++ b/pkg/specgen/generate/container_create.go
@@ -180,10 +180,23 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener
 			if err != nil {
 				return nil, nil, nil, err
 			}
+			resources := runtimeSpec.Linux.Resources
+
+			// resources get overwrritten similarly to pod inheritance, manually assign here if there is a new value
+			marshalRes, err := json.Marshal(resources)
+			if err != nil {
+				return nil, nil, nil, err
+			}
+
 			err = json.Unmarshal(out, runtimeSpec.Linux)
 			if err != nil {
 				return nil, nil, nil, err
 			}
+
+			err = json.Unmarshal(marshalRes, runtimeSpec.Linux.Resources)
+			if err != nil {
+				return nil, nil, nil, err
+			}
 		}
 		if s.ResourceLimits != nil {
 			switch {
@@ -564,5 +577,10 @@ func Inherit(infra libpod.Container, s *specgen.SpecGenerator, rt *libpod.Runtim
 	if err != nil {
 		return nil, nil, nil, err
 	}
+
+	// this causes errors when shmSize is the default value, it will still get passed down unless we manually override.
+	if s.IpcNS.NSMode == specgen.Host && (compatibleOptions.ShmSize != nil && compatibleOptions.IsDefaultShmSize()) {
+		s.ShmSize = nil
+	}
 	return options, infraSpec, compatibleOptions, nil
 }