Merge pull request docker#430 from hqhq/fix_check_error

Fix go vet errors

Author: crosbymichael

cmd/containerd-shim/main.go

@@ -108,7 +108,7 @@ func start(log *os.File) error {
 		return nil
 	}
 	var exitShim bool
-	for {
+	for !exitShim {
 		select {
 		case s := <-signals:
 			switch s {
@@ -122,18 +122,6 @@ func start(log *os.File) error {
 					}
 				}
 			}
-			// runtime has exited so the shim can also exit
-			if exitShim {
-				// kill all processes in the container incase it was not running in
-				// its own PID namespace
-				p.killAll()
-				// wait for all the processes and IO to finish
-				p.Wait()
-				// delete the container from the runtime
-				p.delete()
-				// the close of the exit fifo will happen when the shim exits
-				return nil
-			}
 		case msg := <-msgC:
 			switch msg.Type {
 			case 0:
@@ -153,6 +141,17 @@ func start(log *os.File) error {
 			}
 		}
 	}
+
+	// runtime has exited so the shim can also exit
+
+	// kill all processes in the container incase it was not running in
+	// its own PID namespace
+	p.killAll()
+	// wait for all the processes and IO to finish
+	p.Wait()
+	// delete the container from the runtime
+	p.delete()
+	// the close of the exit fifo will happen when the shim exits
 	return nil
 }
 

cmd/containerd-shim/process.go

@@ -36,7 +36,7 @@ type checkpoint struct {
 }
 
 type processState struct {
-	Terminal    bool     `json:terminal`
+	Terminal    bool     `json:"terminal"`
 	Exec        bool     `json:"exec"`
 	Stdin       string   `json:"containerdStdin"`
 	Stdout      string   `json:"containerdStdout"`