opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-17 15:18:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Vendor in latest containers/common with default capabilities

Browse Source 
Also update vendor of containers/storage and image

Cleanup display of added/dropped capabilties as well

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2022-12-06 19:49:31 -05:00
parent 1cc22631f6
commit 3718ac8e96
141 changed files with 2344 additions and 1555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/networking_linux.go
View File

@ -293,7 +293,7 @@ func (r *RootlessNetNS) Cleanup(runtime *Runtime) error {
return nil
}
logrus.Debug("Cleaning up rootless network namespace")
err = netns.UnmountNS(r.ns)
err = netns.UnmountNS(r.ns.Path())
if err != nil {
return err
}
@ -605,7 +605,7 @@ func (r *Runtime) createNetNS(ctr *Container) (n ns.NetNS, q map[string]types.St
}
defer func() {
if retErr != nil {
if err := netns.UnmountNS(ctrNS); err != nil {
if err := netns.UnmountNS(ctrNS.Path()); err != nil {
logrus.Errorf("Unmounting partially created network namespace for container %s: %v", ctr.ID(), err)
}
if err := ctrNS.Close(); err != nil {
@ -705,7 +705,7 @@ func (r *Runtime) teardownNetNS(ctr *Container) error {
prevErr := r.teardownCNI(ctr)
// First unmount the namespace
if err := netns.UnmountNS(ctr.state.NetNS); err != nil {
if err := netns.UnmountNS(ctr.state.NetNS.Path()); err != nil {
if prevErr != nil {
logrus.Error(prevErr)
}