Merge branch '1.5'

This commit is contained in:
Matthias Radestock committed 2016-06-17 15:07:34 +01:00
commit 0abfdf4efb
2 files changed
+7 -3

No files matched your search

+6 -2
View File
@@ -26,7 +26,12 @@ func dockerTLSArgs(args []string) error {
continue
}
if comm, err := ioutil.ReadFile(filepath.Join(procRoot, dirName, "comm")); err != nil || string(comm) != "docker\n" {
isDaemon := false
if comm, err := ioutil.ReadFile(filepath.Join(procRoot, dirName, "comm")); err != nil {
continue
} else if string(comm) == "dockerd\n" {
isDaemon = true
} else if string(comm) != "docker\n" {
continue
}
@@ -35,7 +40,6 @@ func dockerTLSArgs(args []string) error {
continue
}
isDaemon := false
tlsArgs := []string{}
args := bytes.Split(cmdline, []byte{'\000'})
for i := 0; i < len(args); i++ {