diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-04 14:52:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-04 14:52:19 -0400 |
| commit | bdaac4b2b6573d0954c58da9968536017160b1ed (patch) | |
| tree | b645cdf0fab35e8e31b729eac58c8e3c57a64daa /pkg/util/utils.go | |
| parent | 0e2a80a62258d242cad53cd0bc29a9598a8514ad (diff) | |
| parent | 5fa6f686dbeaf04e1df8a888b9458c3d7f42eee8 (diff) | |
| download | podman-bdaac4b2b6573d0954c58da9968536017160b1ed.tar.gz podman-bdaac4b2b6573d0954c58da9968536017160b1ed.tar.bz2 podman-bdaac4b2b6573d0954c58da9968536017160b1ed.zip | |
Merge pull request #14037 from rhatdan/remoteuri
Report correct RemoteURI
Diffstat (limited to 'pkg/util/utils.go')
| -rw-r--r-- | pkg/util/utils.go | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 9842a0f73..a0bf8b50d 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -731,29 +731,6 @@ func IDtoolsToRuntimeSpec(idMaps []idtools.IDMap) (convertedIDMap []specs.LinuxI return convertedIDMap } -var socketPath string - -func SetSocketPath(path string) { - socketPath = path -} - -func SocketPath() (string, error) { - if socketPath != "" { - return socketPath, nil - } - xdg, err := GetRuntimeDir() - if err != nil { - return "", err - } - if len(xdg) == 0 { - // If no xdg is returned, assume root socket - xdg = "/run" - } - - // Glue the socket path together - return filepath.Join(xdg, "podman", "podman.sock"), nil -} - func LookupUser(name string) (*user.User, error) { // Assume UID look up first, if it fails lookup by username if u, err := user.LookupId(name); err == nil { |