diff --git a/cmd/moby/docker.go b/cmd/moby/docker.go index c297e4b38..821c9c92b 100644 --- a/cmd/moby/docker.go +++ b/cmd/moby/docker.go @@ -21,7 +21,7 @@ import ( "golang.org/x/net/context" ) -func dockerRunInput(input io.Reader, args ...string) ([]byte, error) { +func dockerRun(input io.Reader, args ...string) ([]byte, error) { log.Debugf("docker run (input): %s", strings.Join(args, " ")) docker, err := exec.LookPath("docker") if err != nil { diff --git a/cmd/moby/output.go b/cmd/moby/output.go index d4b48f2c2..1553790f9 100644 --- a/cmd/moby/output.go +++ b/cmd/moby/output.go @@ -232,7 +232,7 @@ func outputImg(image, filename string, kernel []byte, initrd []byte, cmdline str if err != nil { return err } - img, err := dockerRunInput(buf, image, cmdline) + img, err := dockerRun(buf, image, cmdline) if err != nil { return err } @@ -253,9 +253,9 @@ func outputImgSize(image, filename string, kernel []byte, initrd []byte, cmdline } var img []byte if size == 0 { - img, err = dockerRunInput(buf, image) + img, err = dockerRun(buf, image) } else { - img, err = dockerRunInput(buf, image, fmt.Sprintf("%dM", size)) + img, err = dockerRun(buf, image, fmt.Sprintf("%dM", size)) } if err != nil { return err