Merge pull request #338 from wcwxyz/per-pod-hyper-sock

hyperstart: move hyper and tty socket to per-pod runtime storage path
containers · Aug 11, 2017 · 58ebe95 · 58ebe95
2 parents 59004f2 + 4dce315
commit 58ebe95
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/hyperstart.go b/hyperstart.go
@@ -27,7 +27,7 @@ import (
 	"github.com/containers/virtcontainers/pkg/hyperstart"
 )
 
-var defaultSockPathTemplates = []string{"/tmp/hyper-pod-%s.sock", "/tmp/tty-pod%s.sock"}
+var defaultSockPathTemplates = []string{"%s/%s/hyper.sock", "%s/%s/tty.sock"}
 var defaultChannelTemplate = "sh.hyper.channel.%d"
 var defaultDeviceIDTemplate = "channel%d"
 var defaultIDTemplate = "charch%d"
@@ -58,8 +58,8 @@ func (c *HyperConfig) validate(pod Pod) bool {
 		virtLog.Infof("No sockets from configuration")
 
 		podSocketPaths := []string{
-			fmt.Sprintf(defaultSockPathTemplates[0], pod.id),
-			fmt.Sprintf(defaultSockPathTemplates[1], pod.id),
+			fmt.Sprintf(defaultSockPathTemplates[0], runStoragePath, pod.id),
+			fmt.Sprintf(defaultSockPathTemplates[1], runStoragePath, pod.id),
 		}
 
 		c.SockCtlName = podSocketPaths[0]