Merge pull request #28451 from lsm5/podman6-no-slirp-vendor

Podman6: remove slirp mentions from comments

libpod/container.go

@@ -1445,7 +1445,7 @@ func (c *Container) NetworkMode() string {
 	switch {
 	case c.config.CreateNetNS:
 		// We actually store the network
-		// mode for Slirp and Bridge, so
+		// mode for Pasta and Bridge, so
 		// we can just use that
 		networkMode = string(c.config.NetMode)
 	case c.config.NetNsCtr != "":
@@ -1463,7 +1463,7 @@ func (c *Container) NetworkMode() string {
 						networkMode = fmt.Sprintf("ns:%s", ns.Path)
 					} else {
 						// We're making a network ns, but not
-						// configuring with Slirp. That means
+						// configuring networking. That means
 						// it's --net=none
 						networkMode = "none"
 					}

pkg/domain/infra/abi/play.go

@@ -78,7 +78,7 @@ func (ic *ContainerEngine) createServiceContainer(ctx context.Context, name stri
 		MemorySwappiness: -1,
 		ReadOnly:         true,
 		ReadWriteTmpFS:   false,
-		// No need to spin up slirp etc.
+		// No need to set up networking.
 		Net:                  &entities.NetOptions{Network: specgen.Namespace{NSMode: specgen.NoNetwork}},
 		StopTimeout:          rtc.Engine.StopTimeout,
 		HealthLogDestination: define.DefaultHealthCheckLocalDestination,

pkg/specgen/podspecgen.go

@@ -106,13 +106,13 @@ type PodNetworkConfig struct {
 	// containers in the pod.
 	// Cannot be set to FromContainer and FromPod.
 	// Setting this to anything except default conflicts with NoInfra=true.
-	// Defaults to Bridge as root and Slirp as rootless.
+	// Defaults to Bridge as root and Pasta as rootless.
 	// Mandatory.
 	NetNS Namespace `json:"netns"`
 	// PortMappings is a set of ports to map into the infra container.
 	// As, by default, containers share their network with the infra
 	// container, this will forward the ports to the entire pod.
-	// Only available if NetNS is set to Bridge, Slirp, or Pasta.
+	// Only available if NetNS is set to Bridge or Pasta.
 	// Optional.
 	PortMappings []types.PortMapping `json:"portmappings,omitempty"`
 	// Map of networks names to ids the container should join to.

pkg/specgen/specgen.go

@@ -485,14 +485,14 @@ type ContainerNetworkConfig struct {
 	// Mandatory.
 	NetNS Namespace `json:"netns"`
 	// PortBindings is a set of ports to map into the container.
-	// Only available if NetNS is set to bridge, slirp, or pasta.
+	// Only available if NetNS is set to bridge or pasta.
 	// Optional.
 	PortMappings []nettypes.PortMapping `json:"portmappings,omitempty"`
 	// PublishExposedPorts will publish ports specified in the image to
 	// random unused ports (guaranteed to be above 1024) on the host.
 	// This is based on ports set in Expose below, and any ports specified
 	// by the Image (if one is given).
-	// Only available if NetNS is set to Bridge or Slirp.
+	// Only available if NetNS is set to Bridge or Pasta.
 	// Optional.
 	PublishExposedPorts *bool `json:"publish_image_ports,omitempty"`
 	// Expose is a number of ports that will be forwarded to the container
@@ -501,7 +501,7 @@ type ContainerNetworkConfig struct {
 	// protocol i.e map[uint16]string. Allowed protocols are "tcp", "udp", and "sctp", or some
 	// combination of the three separated by commas.
 	// If protocol is set to "" we will assume TCP.
-	// Only available if NetNS is set to Bridge or Slirp, and
+	// Only available if NetNS is set to Bridge or Pasta, and
 	// PublishExposedPorts is set.
 	// Optional.
 	Expose map[uint16]string `json:"expose,omitempty"`