1 files changed, 24 insertions, 0 deletions
diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go
index 7faf13465..f31e46090 100644
--- a/pkg/specgen/generate/container_create.go
+++ b/pkg/specgen/generate/container_create.go
@@ -133,6 +133,12 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener
 
 		options = append(options, libpod.WithRootFSFromImage(newImage.ID(), resolvedImageName, s.RawImageName))
 	}
+
+	_, err = rt.LookupPod(s.Hostname)
+	if len(s.Hostname) > 0 && !s.UtsNS.IsPrivate() && err == nil {
+		// ok, we are incorrectly setting the pod as the hostname, lets undo that before validation
+		s.Hostname = ""
+	}
 	if err := s.Validate(); err != nil {
 		return nil, nil, nil, errors.Wrap(err, "invalid config provided")
 	}
@@ -180,10 +186,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 +583,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
 }