mirror of
https://github.com/podman-container-tools/podman.git
synced 2026-09-10 01:27:54 +00:00
Align codebase with v4.4.1-rhel PodmanConfig structure and API signatures to resolve compilation errors. - Update all cfg.Engine.* references to cfg.ContainersConf.Engine.* or cfg.ContainersConfDefaultsRO.Engine.* - Update all cfg.Network.* references to cfg.ContainersConf.Network.* - Update all cfg.Containers.* references to cfg.ContainersConf.Containers.* or cfg.ContainersConfDefaultsRO.Containers.* - Update cfg.Machine.* references to cfg.ContainersConfDefaultsRO.Machine.* - Fix PodmanConfig initialization in config.go to use ContainersConf and ContainersConfDefaultsRO fields - Add createOptions parameter to NetworkCreate method across all implementations (abi, tunnel, handlers) - Update ContainerEngine interface to match new NetworkCreate signature - Fix manager.Store call in secrets.go to use StoreOptions struct - Update DiskUsage to handle 3 return values - Fix NewConnectionWithIdentity call signature - Remove duplicate setupRemoteConnection function - Remove duplicate readRemoteCliFlags function - Remove duplicate function declarations in container_path_resolution.go, oci_conmon_linux.go - Comment out duplicate SpecGenToOCI and helper functions in oci.go/oci_linux.go - Remove unused imports across multiple files - Fix SSHMode flag handling (field doesn't exist in current PodmanConfig) - Fix ns.NetNS type handling in container_internal_linux.go - Add missing Terminal() method to Container struct - Add missing SdNotifySocket field to ContainerConfig - Fix DefaultCapabilities to use .Get() method - Fix cgroups.AvailableControllers reference - Fix ConmonPath type conversion (attributedstring.Slice) - Add missing ErrNetworkConnected error definition - Fix NetworkCreateOptions handling in secrets.go - Update networking code to use getNetNSPathCommon helper - Fix teardownNetwork method signature - Fix makeInspectPorts to makeInspectPortBindings - Remove hardcoded IsPasta() checks - Fix runtime_libpod.go field access patterns All changes align with the v4.4.1-rhel worktree structure to ensure compatibility with upcoming cherry-picks. Substantially Assisted-by AI: Cursor <auto> Signed-off-by: Chris Evich <cevich@redhat.com>
41 lines
1.9 KiB
Go
41 lines
1.9 KiB
Go
//go:build linux
|
|
// +build linux
|
|
|
|
package libpod
|
|
|
|
import (
|
|
"fmt"
|
|
"net"
|
|
|
|
"golang.org/x/sys/unix"
|
|
)
|
|
|
|
func openUnixSocket(path string) (*net.UnixConn, error) {
|
|
fd, err := unix.Open(path, unix.O_PATH, 0)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer unix.Close(fd)
|
|
return net.DialUnix("unixpacket", nil, &net.UnixAddr{Name: fmt.Sprintf("/proc/self/fd/%d", fd), Net: "unixpacket"})
|
|
}
|
|
|
|
// Attach to the given container.
|
|
// NOTE: This function is defined in oci_conmon_attach_common.go - removed duplicate
|
|
|
|
// Attach to the given container's exec session
|
|
// attachFd and startFd must be open file descriptors
|
|
// attachFd must be the output side of the fd. attachFd is used for two things:
|
|
// conmon will first send a nonce value across the pipe indicating it has set up its side of the console socket
|
|
// this ensures attachToExec gets all of the output of the called process
|
|
// conmon will then send the exit code of the exec process, or an error in the exec session
|
|
// startFd must be the input side of the fd.
|
|
// newSize resizes the tty to this size before the process is started, must be nil if the exec session has no tty
|
|
// conmon will wait to start the exec session until the parent process has set up the console socket.
|
|
// Once attachToExec successfully attaches to the console socket, the child conmon process responsible for calling runtime exec
|
|
// will read from the output side of start fd, thus learning to start the child process.
|
|
// Thus, the order goes as follow:
|
|
// 1. conmon parent process sets up its console socket. sends on attachFd
|
|
// 2. attachToExec attaches to the console socket after reading on attachFd and resizes the tty
|
|
// 3. child waits on startFd for attachToExec to attach to said console socket
|
|
// 4. attachToExec sends on startFd, signalling it has attached to the socket and child is ready to go
|
|
// 5. child receives on startFd, runs the runtime exec command
|