From be6d2b2cfdb9d81ed73f17931fed97e464d8ef9e Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Tue, 30 Nov 2021 12:25:22 +0100
Subject: [PATCH] containers-common-1-13.el9

- use log_driver = "journald" and events_logger = "journald" for RHEL9
- Related: #2000051

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 containers-common.spec | 6 +++++-
 containers.conf        | 4 ++--
 update.sh              | 6 ++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/containers-common.spec b/containers-common.spec
index 2d75b71..5eeb5d7 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -12,7 +12,7 @@
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 12%{?dist}
+Release: 13%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildArch: noarch
@@ -160,6 +160,10 @@ EOF
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Tue Nov 30 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-13
+- use log_driver = "journald" and events_logger = "journald" for RHEL9
+- Related: #2000051
+
 * Tue Nov 16 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-12
 - consume seccomp.json from the oldest vendored version of c/common,
   not main branch
diff --git a/containers.conf b/containers.conf
index 154d121..417c54c 100644
--- a/containers.conf
+++ b/containers.conf
@@ -153,7 +153,7 @@ default_sysctls = [
 # Logging driver for the container. Available options: k8s-file and journald.
 #
 #log_driver = "k8s-file"
-log_driver = "k8s-file"
+log_driver = "journald"
 
 # Maximum size allowed for the container log file. Negative numbers indicate
 # that no size limit is imposed. If positive, it must be >= 8192 to match or
@@ -342,7 +342,7 @@ log_driver = "k8s-file"
 # Valid values are `journald`, `file` and `none`.
 #
 #events_logger = "journald"
-events_logger = "file"
+events_logger = "journald"
 
 # A is a list of directories which are used to search for helper binaries.
 #
diff --git a/update.sh b/update.sh
index 121c12e..c0b016d 100755
--- a/update.sh
+++ b/update.sh
@@ -23,19 +23,21 @@ $2 = $3" $1
 spectool -f -g containers-common.spec
 ensure storage.conf    driver                        \"overlay\"
 ensure storage.conf    mountopt                      \"nodev,metacopy=on\"
-ensure containers.conf events_logger                 \"file\"
-ensure containers.conf log_driver                    \"k8s-file\"
 if pwd | grep rhel-8 > /dev/null
 then
 ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"docker.io\"]
 ensure registries.conf short-name-mode               \"permissive\"
 ensure containers.conf infra_image                   \"registry.access.redhat.com/ubi8/pause\"
 ensure containers.conf runtime                       \"runc\"
+ensure containers.conf events_logger                 \"file\"
+ensure containers.conf log_driver                    \"k8s-file\"
 else
 ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"quay.io\",\ \"docker.io\"]
 ensure registries.conf short-name-mode               \"enforcing\"
 ensure containers.conf infra_image                   \"registry.access.redhat.com/ubi8/pause\"
 ensure containers.conf runtime                       \"crun\"
+ensure containers.conf events_logger                 \"journald\"
+ensure containers.conf log_driver                    \"journald\"
 fi
 [ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \
 				"keyctl",' seccomp.json