diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-14 09:41:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-14 09:41:18 +0200 |
| commit | 797060f98a34ff9f421f0150b426c62409eb647d (patch) | |
| tree | 781c73e3406e1ea934655b8a8211ea717f6f729a | |
| parent | 8b3e2b049c66dec0ccb4c6c5f45d3cd81608d8b5 (diff) | |
| parent | dd8bb2d08811de27bf7d13816ee0c21d2abe8722 (diff) | |
| download | podman-797060f98a34ff9f421f0150b426c62409eb647d.tar.gz podman-797060f98a34ff9f421f0150b426c62409eb647d.tar.bz2 podman-797060f98a34ff9f421f0150b426c62409eb647d.zip | |
Merge pull request #3116 from mheon/fix_libpod_conf
Fix libpod.conf option ordering
| -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. |