opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-16 18:53:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24082 from Luap99/netns-leak

Browse Source 
Fix netns leak on container creation and exit code 1 on SIGTERM.
This commit is contained in:
openshift-merge-bot[bot]
2024-10-01 21:02:05 +00:00
committed by GitHub
parent 13b78c9da9 5de7b7c3f3
commit 857a47de9b
4 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/server/server.go
View File

@ -197,7 +197,13 @@ func (s *APIServer) Serve() error {
s.setupPprof()
if err := shutdown.Register("service", func(sig os.Signal) error {
return s.Shutdown(true)
err := s.Shutdown(true)
if err == nil {
// For `systemctl stop podman.service` support, exit code should be 0
// but only if we did indeed gracefully shutdown
shutdown.SetExitCode(0)
}
return err
}); err != nil {
return err
}