github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

fixes #744 no-shim will crash containerd with ctr list and ctr info

Browse Source 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
This commit is contained in:
Krasi Georgiev
2017-05-01 16:58:28 +03:00
parent 19edcb72b5
commit 0e7e89c0f1
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
linux/shim.go
View File

@@ -24,7 +24,7 @@ import (
func newShim(path string, remote bool) (shim.ShimClient, error) {
if !remote {
return localShim.Client(path), nil
return localShim.Client(path)
}
socket := filepath.Join(path, "shim.sock")
l, err := sys.CreateUnixSocket(socket)
@@ -59,7 +59,7 @@ func newShim(path string, remote bool) (shim.ShimClient, error) {
func loadShim(path string, remote bool) (shim.ShimClient, error) {
if !remote {
return localShim.Client(path), nil
return localShim.Client(path)
}
socket := filepath.Join(path, "shim.sock")
return connectShim(socket)