Skip to content

Commit 583764c

Browse files
committed
Cirrus: Remove slirp4netns from logcollector script
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
1 parent 48e1ad4 commit 583764c

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

contrib/cirrus/logcollector.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ case $1 in
4747
passt
4848
podman
4949
skopeo
50-
slirp4netns
5150
)
5251
case $OS_RELEASE_ID in
5352
fedora)

pkg/domain/infra/abi/network.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/containers/podman/v6/libpod/events"
1414
"github.com/containers/podman/v6/pkg/domain/entities"
1515
"go.podman.io/common/libnetwork/pasta"
16-
"go.podman.io/common/libnetwork/slirp4netns"
1716
"go.podman.io/common/libnetwork/types"
1817
netutil "go.podman.io/common/libnetwork/util"
1918
)
@@ -180,7 +179,7 @@ func (ic *ContainerEngine) NetworkRm(ctx context.Context, namesOrIds []string, o
180179
}
181180

182181
func (ic *ContainerEngine) NetworkCreate(_ context.Context, network types.Network, createOptions *types.NetworkCreateOptions) (*types.Network, error) {
183-
if slices.Contains([]string{"none", "host", "bridge", "private", slirp4netns.BinaryName, pasta.BinaryName, "container", "ns", "default"}, network.Name) {
182+
if slices.Contains([]string{"none", "host", "bridge", "private", pasta.BinaryName, "container", "ns", "default"}, network.Name) {
184183
return nil, fmt.Errorf("cannot create network with name %q because it conflicts with a valid network mode", network.Name)
185184
}
186185
network, err := ic.Libpod.Network().NetworkCreate(network, createOptions)

0 commit comments

Comments
 (0)