3 files changed, 25 insertions, 5 deletions
diff --git a/pkg/domain/infra/abi/generate.go b/pkg/domain/infra/abi/generate.go
index 0b73ddd7e..79bf2291e 100644
--- a/pkg/domain/infra/abi/generate.go
+++ b/pkg/domain/infra/abi/generate.go
@@ -19,11 +19,11 @@ func (ic *ContainerEngine) GenerateSystemd(ctx context.Context, nameOrID string,
 	ctr, ctrErr := ic.Libpod.LookupContainer(nameOrID)
 	if ctrErr == nil {
 		// Generate the unit for the container.
-		s, err := generate.ContainerUnit(ctr, options)
+		name, content, err := generate.ContainerUnit(ctr, options)
 		if err != nil {
 			return nil, err
 		}
-		return &entities.GenerateSystemdReport{Output: s}, nil
+		return &entities.GenerateSystemdReport{Units: map[string]string{name: content}}, nil
 	}
 
 	// If it's not a container, we either have a pod or garbage.
@@ -34,11 +34,11 @@ func (ic *ContainerEngine) GenerateSystemd(ctx context.Context, nameOrID string,
 	}
 
 	// Generate the units for the pod and all its containers.
-	s, err := generate.PodUnits(pod, options)
+	units, err := generate.PodUnits(pod, options)
 	if err != nil {
 		return nil, err
 	}
-	return &entities.GenerateSystemdReport{Output: s}, nil
+	return &entities.GenerateSystemdReport{Units: units}, nil
 }
 
 func (ic *ContainerEngine) GenerateKube(ctx context.Context, nameOrID string, options entities.GenerateKubeOptions) (*entities.GenerateKubeReport, error) {
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index 70d740bb5..6b94ca9c0 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -251,6 +251,7 @@ func (ir *ImageEngine) Pull(ctx context.Context, rawImage string, options entiti
 		DockerCertPath:              options.CertDir,
 		OSChoice:                    options.OverrideOS,
 		ArchitectureChoice:          options.OverrideArch,
+		VariantChoice:               options.OverrideVariant,
 		DockerInsecureSkipTLSVerify: options.SkipTLSVerify,
 	}
 
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
index 4ebc37cda..31ad51672 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -144,6 +144,16 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
 		podOptions = append(podOptions, libpod.WithPodHostNetwork())
 	}
 
+	if podYAML.Spec.HostAliases != nil {
+		hosts := make([]string, 0, len(podYAML.Spec.HostAliases))
+		for _, hostAlias := range podYAML.Spec.HostAliases {
+			for _, host := range hostAlias.Hostnames {
+				hosts = append(hosts, host+":"+hostAlias.IP)
+			}
+		}
+		podOptions = append(podOptions, libpod.WithPodHosts(hosts))
+	}
+
 	nsOptions, err := generate.GetNamespaceOptions(strings.Split(createconfig.DefaultKernelNamespaces, ","))
 	if err != nil {
 		return nil, err
@@ -250,13 +260,22 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
 				if err := libpod.LabelVolumePath(hostPath.Path); err != nil {
 					return nil, errors.Wrapf(err, "Error giving %s a label", hostPath.Path)
 				}
+			case v1.HostPathSocket:
+				st, err := os.Stat(hostPath.Path)
+				if err != nil {
+					return nil, errors.Wrapf(err, "Error checking HostPathSocket")
+				}
+				if st.Mode()&os.ModeSocket != os.ModeSocket {
+					return nil, errors.Errorf("Error checking HostPathSocket: path %s is not a socket", hostPath.Path)
+				}
+
 			case v1.HostPathDirectory:
 			case v1.HostPathFile:
 			case v1.HostPathUnset:
 				// do nothing here because we will verify the path exists in validateVolumeHostDir
 				break
 			default:
-				return nil, errors.Errorf("Directories are the only supported HostPath type")
+				return nil, errors.Errorf("Invalid HostPath type %v", hostPath.Type)
 			}
 		}