GitList

Browse code

Fixes #21545

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 0d9b94c4c5d6b4f03a7a86e731e4110e9f27a51e)

Tonis Tiigi authored on 2016/03/29 09:33:09
Showing 2 changed files

@@ -144,6 +144,7 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error {
                      		d.Command,
                      		"--containerd", "/var/run/docker/libcontainerd/docker-containerd.sock",
                      		"--graph", d.root,
                     +		"--exec-root", filepath.Join(d.folder, "exec-root"),
                      		"--pidfile", fmt.Sprintf("%s/docker.pid", d.folder),
                      		fmt.Sprintf("--userland-proxy=%t", d.userlandProxy),
+                     	)

@@ -210,7 +210,7 @@ func (r *remote) getLastEventTimestamp() int64 {
                      	t := time.Now()
                      	fi, err := os.Stat(r.eventTsPath)
                     -	if os.IsNotExist(err) {
                     +	if os.IsNotExist(err) || fi.Size() == 0 {
                      		return t.Unix()
+                     	}