aboutsummaryrefslogtreecommitdiff
path: root/cmd/podman/start.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-27 20:55:48 +0100
committerGitHub <noreply@github.com>2020-03-27 20:55:48 +0100
commit3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2 (patch)
treed085118d9cf28ed6a8a7b40c1bd6bb5b772b10cc /cmd/podman/start.go
parent1fe2fbb42114b9072a1caf359beff63042df90fd (diff)
parent4352d585490f6c1eb7234ef4f92e0157083d69b3 (diff)
downloadpodman-3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2.tar.gz
podman-3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2.tar.bz2
podman-3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2.zip
Merge pull request #4698 from rhatdan/containers.conf
Add support for containers.conf
Diffstat (limited to 'cmd/podman/start.go')
-rw-r--r--cmd/podman/start.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/cmd/podman/start.go b/cmd/podman/start.go
index a070cd18d..ee700032f 100644
--- a/cmd/podman/start.go
+++ b/cmd/podman/start.go
@@ -35,10 +35,7 @@ func init() {
startCommand.SetUsageTemplate(UsageTemplate())
flags := startCommand.Flags()
flags.BoolVarP(&startCommand.Attach, "attach", "a", false, "Attach container's STDOUT and STDERR")
- // Clear the default, the value specified in the config file should have the
- // priority
- startCommand.DetachKeys = ""
- flags.StringVar(&startCommand.DetachKeys, "detach-keys", define.DefaultDetachKeys, "Select the key sequence for detaching a container. Format is a single character `[a-Z]` or a comma separated sequence of `ctrl-<value>`, where `<value>` is one of: `a-z`, `@`, `^`, `[`, `\\`, `]`, `^` or `_`")
+ flags.StringVar(&startCommand.DetachKeys, "detach-keys", getDefaultDetachKeys(), "Select the key sequence for detaching a container. Format is a single character `[a-Z]` or a comma separated sequence of `ctrl-<value>`, where `<value>` is one of: `a-z`, `@`, `^`, `[`, `\\`, `]`, `^` or `_`")
flags.BoolVarP(&startCommand.Interactive, "interactive", "i", false, "Keep STDIN open even if not attached")
flags.BoolVarP(&startCommand.Latest, "latest", "l", false, "Act on the latest container podman is aware of")
flags.BoolVar(&startCommand.SigProxy, "sig-proxy", false, "Proxy received signals to the process (default true if attaching, false otherwise)")