summaryrefslogtreecommitdiff
path: root/cmd/podman/run.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-02-06 23:03:21 +0100
committerGitHub <noreply@github.com>2019-02-06 23:03:21 +0100
commitc7350721bff99fb4455a0ddb51e7155e04a9283d (patch)
tree9c5dd9778e8cdd8fc9f0b5880c3fdb7f9a615d61 /cmd/podman/run.go
parent72fcfb7e8624a4f61761d10f3bd80d9c6da3e31e (diff)
parent0830bb9035a9ee35810e358a32b8011da2dc1be6 (diff)
downloadpodman-c7350721bff99fb4455a0ddb51e7155e04a9283d.tar.gz
podman-c7350721bff99fb4455a0ddb51e7155e04a9283d.tar.bz2
podman-c7350721bff99fb4455a0ddb51e7155e04a9283d.zip
Merge pull request #2252 from rhatdan/system
Add podman system prune and info commands
Diffstat (limited to 'cmd/podman/run.go')
-rw-r--r--cmd/podman/run.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/run.go b/cmd/podman/run.go
index 20cb85347..3ef546940 100644
--- a/cmd/podman/run.go
+++ b/cmd/podman/run.go
@@ -20,7 +20,7 @@ var runDescription = "Runs a command in a new container from the given image"
var runFlags []cli.Flag = append(createFlags, cli.BoolTFlag{
Name: "sig-proxy",
- Usage: "proxy received signals to the process (default true)",
+ Usage: "Proxy received signals to the process (default true)",
})
var runCommand = cli.Command{
@@ -131,6 +131,7 @@ func runCmd(c *cli.Context) error {
ctrExitCode, err := readExitFile(runtime.GetConfig().TmpDir, ctr.ID())
if err != nil {
logrus.Errorf("Cannot get exit code: %v", err)
+ exitCode = 127
} else {
exitCode = ctrExitCode
}