From c98538db7dc67632d3a46dead15a785b81aef2fe Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Wed, 30 Oct 2024 13:35:56 +0100 Subject: [PATCH] libpod: use pasta Setup() over Setup2() Setup2() calls Setup() so they are both the same thing, the idea was to keep Setup2() around in c/common for a bit to avoid breaking changes during our regular vendoring. Now just use Setup() so we can get rid of Setup2() in c/common. https://github.com/containers/common/pull/2136/commits/a7415c3eab4675a5b37dbee9d33833af5f2b086e Signed-off-by: Paul Holzinger --- libpod/networking_pasta_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpod/networking_pasta_linux.go b/libpod/networking_pasta_linux.go index 7934bc5917..89724514b4 100644 --- a/libpod/networking_pasta_linux.go +++ b/libpod/networking_pasta_linux.go @@ -12,7 +12,7 @@ package libpod import "github.com/containers/common/libnetwork/pasta" func (r *Runtime) setupPasta(ctr *Container, netns string) error { - res, err := pasta.Setup2(&pasta.SetupOptions{ + res, err := pasta.Setup(&pasta.SetupOptions{ Config: r.config, Netns: netns, Ports: ctr.convertPortMappings(),