From 0f389750defb05318144c76645808719db79b246 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 18 May 2021 11:53:01 -0400
Subject: [PATCH] containers-common-4:1-19

- use container-selinux 2.162.1 and use latest configs

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 containers-common.spec       | 7 +++++--
 containers-storage.conf.5.md | 3 +++
 containers.conf.5.md         | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/containers-common.spec b/containers-common.spec
index 8c2499e..4da1686 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -15,13 +15,13 @@
 Epoch: 4
 Name: containers-common
 Version: 1
-Release: 18%{?dist}
+Release: 19%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildArch: noarch
 BuildRequires: go-md2man
 Provides: skopeo-containers = %{epoch}:%{version}-%{release}
-Requires: (container-selinux >= 2:2.160.0 if selinux-policy)
+Requires: (container-selinux >= 2:2.162.1 if selinux-policy)
 Requires: oci-runtime
 Recommends: fuse-overlayfs
 Recommends: slirp4netns
@@ -136,6 +136,9 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Tue May 18 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-19
+- use container-selinux 2.162.1 and use latest configs
+
 * Tue May 11 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-18
 - Update containers.conf to latest, and change default log-driver to journald.
 
diff --git a/containers-storage.conf.5.md b/containers-storage.conf.5.md
index 7f9e003..dba3e7b 100644
--- a/containers-storage.conf.5.md
+++ b/containers-storage.conf.5.md
@@ -87,6 +87,9 @@ The `storage.options` table supports the following options:
 **auto-userns-max-size**=65536
   Auto-userns-max-size is the maximum size for a user namespace created automatically.
 
+**disable-volatile**=true
+  If disable-volatile is set, then the "volatile" mount optimization is disabled for all the containers.
+
 ### STORAGE OPTIONS FOR AUFS TABLE
 
 The `storage.options.aufs` table supports the following options:
diff --git a/containers.conf.5.md b/containers.conf.5.md
index 944dac7..a42332e 100644
--- a/containers.conf.5.md
+++ b/containers.conf.5.md
@@ -175,7 +175,7 @@ the container.
 
 Indicates whether the container engine uses MAC(SELinux) container separation via labeling. This option is ignored on disabled systems.
 
-**log_driver**="journald"
+**log_driver**="k8s-file"
 
 Logging driver for the container. Available options: `k8s-file` and `journald`.