summaryrefslogtreecommitdiff
path: root/pkg/domain/infra
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-04-21 08:05:35 -0400
committerGitHub <noreply@github.com>2021-04-21 08:05:35 -0400
commit544c3156657e078cef297623842f79cb72dc32c6 (patch)
tree21431acac4d8c92fb26276680de283e2d0730982 /pkg/domain/infra
parent41677b192aac6ae2849aa792e4ded856773712fd (diff)
parent659dc7843c560c9386fbc3e54ad860c3f2ef2940 (diff)
downloadpodman-544c3156657e078cef297623842f79cb72dc32c6.tar.gz
podman-544c3156657e078cef297623842f79cb72dc32c6.tar.bz2
podman-544c3156657e078cef297623842f79cb72dc32c6.zip
Merge pull request #10080 from rhatdan/remote
podman-remote should show podman.sock info
Diffstat (limited to 'pkg/domain/infra')
-rw-r--r--pkg/domain/infra/abi/system.go10
1 files changed, 2 insertions, 8 deletions
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go
index f87f9e370..6319c1ab1 100644
--- a/pkg/domain/infra/abi/system.go
+++ b/pkg/domain/infra/abi/system.go
@@ -32,17 +32,11 @@ func (ic *ContainerEngine) Info(ctx context.Context) (*define.Info, error) {
if err != nil {
return nil, err
}
- xdg, err := util.GetRuntimeDir()
+
+ socketPath, err := util.SocketPath()
if err != nil {
return nil, err
}
- if len(xdg) == 0 {
- // If no xdg is returned, assume root socket
- xdg = "/run"
- }
-
- // Glue the socket path together
- socketPath := filepath.Join(xdg, "podman", "podman.sock")
rs := define.RemoteSocket{
Path: socketPath,
Exists: false,