aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-02-22 23:14:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1946 from fidencio/wip/weekly-backports-to-stable-2.1

Browse Source 
[stable-2.1] Weekly backports to stable-2.1 branch, May 31st 2021
This commit is contained in:
Julio Montes
2021-06-01 16:00:42 -05:00
committed by GitHub
parent 57f7ffbe39 915fea7b1f
commit ff206cf6cf
3 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/runtime/virtcontainers/virtiofsd.go
View File

@@ -75,6 +75,8 @@ func (v *virtiofsd) getSocketFD() (*os.File, error) {
if err != nil {
return nil, err
}
// no longer needed since fd is a dup
defer listener.Close()
listener.SetUnlinkOnClose(false)
@@ -98,6 +100,7 @@ func (v *virtiofsd) Start(ctx context.Context) (int, error) {
if err != nil {
return 0, err
}
defer socketFD.Close()
cmd.ExtraFiles = append(cmd.ExtraFiles, socketFD)
@@ -128,7 +131,7 @@ func (v *virtiofsd) Start(ctx context.Context) (int, error) {
v.wait = waitVirtiofsReady
}
return pid, socketFD.Close()
return cmd.Process.Pid, nil
}
func (v *virtiofsd) Stop(ctx context.Context) error {