Skip to content

Commit 8f2cfd7

Browse files
rhatdanvrothberg
authored andcommitted
Fix location of stop_timeout in default containers.conf
stop_timeout has to be defined in the engine section not the engine.runtimes section. Cherry-pick: commit b1dc011 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
1 parent 6daa218 commit 8f2cfd7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

pkg/config/containers.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,9 @@
364364
#
365365
# runtime_supports_kvm = ["kata"]
366366

367+
# Number of seconds to wait for container to exit before sending kill signal.
368+
# stop_timeout = 10
369+
367370
# Paths to look for a valid OCI runtime (runc, runv, kata, etc)
368371
[engine.runtimes]
369372
# runc = [
@@ -397,9 +400,6 @@
397400
# "/usr/bin/kata-fc",
398401
# ]
399402

400-
# Number of seconds to wait for container to exit before sending kill signal.
401-
#stop_timeout = 10
402-
403403
# The [engine.runtimes] table MUST be the last entry in this file.
404404
# (Unless another table is added)
405405
# TOML does not provide a way to end a table other than a further table being

0 commit comments

Comments
 (0)