opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-25 02:04:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16512 from dfr/freebsd-preserve-fds

Browse Source 
Add support for --preserve-fds on FreeBSD for run and exec
This commit is contained in:
OpenShift Merge Robot
2022-11-17 16:49:18 +00:00
committed by GitHub
parent 337d8b9c95 4c1294ccb7
commit c67a5184dd
6 changed files with 142 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/domain/infra/abi/containers.go
View File

@ -870,7 +870,7 @@ func makeExecConfig(options entities.ExecOptions, rt *libpod.Runtime) (*libpod.E
func checkExecPreserveFDs(options entities.ExecOptions) error {
if options.PreserveFDs > 0 {
entries, err := os.ReadDir("/proc/self/fd")
entries, err := os.ReadDir(processFileDescriptorsPath)
if err != nil {
return err
}
@ -879,7 +879,7 @@ func checkExecPreserveFDs(options entities.ExecOptions) error {
for _, e := range entries {
i, err := strconv.Atoi(e.Name())
if err != nil {
return fmt.Errorf("cannot parse %s in /proc/self/fd: %w", e.Name(), err)
return fmt.Errorf("cannot parse %s in %s: %w", e.Name(), processFileDescriptorsPath, err)
}
m[i] = true
}

3
pkg/domain/infra/abi/containers_freebsd.go Normal file
View File

@ -0,0 +1,3 @@
package abi
const processFileDescriptorsPath = "/dev/fd"

3
pkg/domain/infra/abi/containers_linux.go Normal file
View File

@ -0,0 +1,3 @@
package abi
const processFileDescriptorsPath = "/proc/self/fd"