summaryrefslogtreecommitdiff
path: root/libpod/runtime.go
diff options
context:
space:
mode:
authorMarco Vedovati <mvedovati@suse.com>2019-06-13 19:33:58 +0200
committerMarco Vedovati <mvedovati@suse.com>2019-06-26 10:12:34 +0200
commit7e3f1c21b060762c39139d59f73ad589a54e03fa (patch)
tree7f5277de21ca56187c1a794cc79ad0c643aaca4e /libpod/runtime.go
parentc9078936dd1bf5bdb59066eb1bdd179ac58f98e1 (diff)
downloadpodman-7e3f1c21b060762c39139d59f73ad589a54e03fa.tar.gz
podman-7e3f1c21b060762c39139d59f73ad589a54e03fa.tar.bz2
podman-7e3f1c21b060762c39139d59f73ad589a54e03fa.zip
libpod: specify a detach keys sequence in libpod.conf
Add the ability of specifying a detach keys sequence in libpod.conf Signed-off-by: Marco Vedovati <mvedovati@suse.com>
Diffstat (limited to 'libpod/runtime.go')
-rw-r--r--libpod/runtime.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 152af031a..b7d6dc245 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -81,6 +81,10 @@ var (
DefaultSHMLockPath = "/libpod_lock"
// DefaultRootlessSHMLockPath is the default path for rootless SHM locks
DefaultRootlessSHMLockPath = "/libpod_rootless_lock"
+
+ // DefaultDetachKeys is the default keys sequence for detaching a
+ // container
+ DefaultDetachKeys = "ctrl-p,ctrl-q"
)
// A RuntimeOption is a functional option which alters the Runtime created by
@@ -236,6 +240,8 @@ type RuntimeConfig struct {
EventsLogger string `toml:"events_logger"`
// EventsLogFilePath is where the events log is stored.
EventsLogFilePath string `toml:-"events_logfile_path"`
+ //DetachKeys is the sequence of keys used to detach a container
+ DetachKeys string `toml:"detach_keys"`
}
// runtimeConfiguredFrom is a struct used during early runtime init to help
@@ -311,6 +317,7 @@ func defaultRuntimeConfig() (RuntimeConfig, error) {
EnableLabeling: true,
NumLocks: 2048,
EventsLogger: events.DefaultEventerType.String(),
+ DetachKeys: DefaultDetachKeys,
}, nil
}