diff options
| author | Jhon Honce <jhonce@redhat.com> | 2020-04-20 11:52:47 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2020-04-20 11:52:47 -0700 |
| commit | 405e39b0d67947bd459d6d63555fb5f0e55e7a4e (patch) | |
| tree | 74f716a370d1ac50e702e28e0d0eb1f711532650 /cmd/podman/system/service.go | |
| parent | 06152434e629c86710ca94e075088b89fb26f126 (diff) | |
| download | podman-405e39b0d67947bd459d6d63555fb5f0e55e7a4e.tar.gz podman-405e39b0d67947bd459d6d63555fb5f0e55e7a4e.tar.bz2 podman-405e39b0d67947bd459d6d63555fb5f0e55e7a4e.zip | |
V2 Rmove existing unix domain socket on startup
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'cmd/podman/system/service.go')
| -rw-r--r-- | cmd/podman/system/service.go | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go index 6522a45f8..e09107b53 100644 --- a/cmd/podman/system/service.go +++ b/cmd/podman/system/service.go @@ -2,8 +2,10 @@ package system import ( "fmt" + "net/url" "os" "path/filepath" + "syscall" "time" "github.com/containers/libpod/cmd/podman/registry" @@ -59,6 +61,23 @@ func service(cmd *cobra.Command, args []string) error { } logrus.Infof("using API endpoint: '%s'", apiURI) + // Clean up any old existing unix domain socket + if len(apiURI) > 0 { + uri, err := url.Parse(apiURI) + if err != nil { + return err + } + + // socket activation uses a unix:// socket in the shipped unit files but apiURI is coded as "" at this layer. + if "unix" == uri.Scheme && !registry.IsRemote() { + if err := syscall.Unlink(uri.Path); err != nil && !os.IsNotExist(err) { + return err + } + mask := syscall.Umask(0177) + defer syscall.Umask(mask) + } + } + opts := entities.ServiceOptions{ URI: apiURI, Timeout: time.Duration(srvArgs.Timeout) * time.Second, |