diff options
author | Matthew Heon <matthew.heon@pm.me> | 2019-05-13 16:06:21 -0400 |
---|---|---|
committer | Matthew Heon <matthew.heon@pm.me> | 2019-05-13 16:09:40 -0400 |
commit | dd8bb2d08811de27bf7d13816ee0c21d2abe8722 (patch) | |
tree | 43a5466b858b07db0873c0aaf589eb86aa3ef2aa | |
parent | ec382e4c8df06558cac73df26aee8e3a3f2429df (diff) | |
download | podman-dd8bb2d08811de27bf7d13816ee0c21d2abe8722.tar.gz podman-dd8bb2d08811de27bf7d13816ee0c21d2abe8722.tar.bz2 podman-dd8bb2d08811de27bf7d13816ee0c21d2abe8722.zip |
Fix libpod.conf option ordering
Adding the journald configuration broke decoding the default
libpod.conf, because it was after the [runtimes] table (and was
being interpreted as a member of the table, and not the larger
config). We can't easily fix this on the TOML side, so our best
bet is to move it above the table and add a comment to try and
make sure this doesn't happen again.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
-rw-r--r-- | libpod.conf | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libpod.conf b/libpod.conf index 08e80fac1..ce6b95cda 100644 --- a/libpod.conf +++ b/libpod.conf @@ -99,6 +99,10 @@ num_locks = 2048 # Uncomment to change location from this default. #volume_path = "/var/lib/containers/storage/volumes" +# Selects which logging mechanism to use for Podman events. Valid values +# are `journald` or `file`. +# events_logger = "journald" + # Default OCI runtime runtime = "runc" @@ -114,6 +118,8 @@ runc = [ "/usr/lib/cri-o-runc/sbin/runc" ] -# Selects which logging mechanism to use for Podman events. Valid values -# are `journald` or `file`. -# events_logger = "journald" +# The [runtimes] table MUST be the last thing in this file. +# (Unless another table is added) +# TOML does not provide a way to end a table other than a further table being +# defined, so every key hereafter will be part of [runtimes] and not the main +# config. |