From d403936818b8785b65ff55ebab0d266b4a871ef6 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Wed, 2 Jul 2014 00:54:08 +0000 Subject: [PATCH] fix compilation and panic Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) --- daemon/execdriver/native/driver.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/execdriver/native/driver.go b/daemon/execdriver/native/driver.go index b789cc072d..90333703c5 100644 --- a/daemon/execdriver/native/driver.go +++ b/daemon/execdriver/native/driver.go @@ -178,7 +178,7 @@ func (d *driver) Terminate(p *execdriver.Command) error { } // TODO: Remove this part for version 1.2.0 // This is added only to ensure smooth upgrades from pre 1.1.0 to 1.1.0 - data, err := ioutil.ReadAll(filepath.Join(d.root, p.ID, "start")) + data, err := ioutil.ReadFile(filepath.Join(d.root, p.ID, "start")) if err != nil { // if we don't have the data on disk then we can assume the process is gone // because this is only removed after we know the process has stopped @@ -187,7 +187,7 @@ func (d *driver) Terminate(p *execdriver.Command) error { } return err } - state.InitStartTime = string(data) + state = &libcontainer.State{InitStartTime: string(data)} } currentStartTime, err := system.GetProcessStartTime(p.Process.Pid)