mirror of
https://github.com/containers/podman.git
synced 2025-12-14 11:00:10 +08:00
Bump c/storage to v1.57.1, c/image v5.34.0, c/common v0.62.0
If not already bumped, this will bump: c/storage v1.57.1 c/image v5.34.0 c/common v0.62.0 in preparation for Podman v5.4 and beyond. Buildah will be vendored in a separate PR. Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
9
vendor/github.com/containers/common/libnetwork/internal/rootlessnetns/netns_linux.go
generated
vendored
9
vendor/github.com/containers/common/libnetwork/internal/rootlessnetns/netns_linux.go
generated
vendored
@@ -135,6 +135,15 @@ func (n *Netns) getOrCreateNetns() (ns.NetNS, bool, error) {
|
||||
}
|
||||
// In case of errors continue and setup the network cmd again.
|
||||
} else {
|
||||
// Special case, the file might exist already but is not a valid netns.
|
||||
// One reason could be that a previous setup was killed between creating
|
||||
// the file and mounting it. Or if the file is not on tmpfs (deleted on boot)
|
||||
// you might run into it as well: https://github.com/containers/podman/issues/25144
|
||||
// We have to do this because NewNSAtPath fails with EEXIST otherwise
|
||||
if errors.As(err, &ns.NSPathNotNSErr{}) {
|
||||
// We don't care if this fails, NewNSAtPath() should return the real error.
|
||||
_ = os.Remove(nsPath)
|
||||
}
|
||||
logrus.Debugf("Creating rootless network namespace at %q", nsPath)
|
||||
// We have to create the netns dir again here because it is possible
|
||||
// that cleanup() removed it.
|
||||
|
||||
Reference in New Issue
Block a user