From 7fa5d9b39dee645c98f0c4d585dcdd7487b17ccf Mon Sep 17 00:00:00 2001 From: Marco Vedovati Date: Thu, 5 Dec 2019 21:06:34 +0100 Subject: Use terminal detach keys sequence specified in the config file Fixes: #4556 Signed-off-by: Marco Vedovati --- cmd/podman/start.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cmd/podman/start.go') diff --git a/cmd/podman/start.go b/cmd/podman/start.go index d4b4534bb..a070cd18d 100644 --- a/cmd/podman/start.go +++ b/cmd/podman/start.go @@ -35,6 +35,9 @@ 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-`, where `` 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") -- cgit v1.2.3-54-g00ecf