From 4f274507d0d645ba60d2c70d89324c679585fe93 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Mon, 8 Nov 2021 07:32:58 -0500
Subject: [PATCH] Update to grab latest man pages and configuration files

---
 containers-common.spec       |  5 ++++-
 containers-storage.conf.5.md |  6 +++++-
 shortnames.conf              |  3 +++
 storage.conf                 | 11 ++++++++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/containers-common.spec b/containers-common.spec
index 30da556..5e1b8d5 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -16,7 +16,7 @@
 Epoch: 4
 Name: containers-common
 Version: 1
-Release: 34%{?dist}
+Release: 35%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildArch: noarch
@@ -161,6 +161,9 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Mon Nov 8 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-35
+- Update to grab latest man pages and configuration files
+
 * Thu Oct 21 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-34
 - Update to grab latest man pages and configuration files
 
diff --git a/containers-storage.conf.5.md b/containers-storage.conf.5.md
index 1f81de8..8a82bdc 100644
--- a/containers-storage.conf.5.md
+++ b/containers-storage.conf.5.md
@@ -315,7 +315,11 @@ This is a way to prevent xfs_quota management from conflicting with containers/s
 
 ## FILES
 
-Distributions often provide a `/usr/share/containers/storage.conf` file to define default storage configuration. Administrators can override this file by creating `/etc/containers/storage.conf` to specify their own configuration. The storage.conf file for rootless users is stored in the `$XDG_CONFIG_HOME/containers/storage.conf` file.  If `$XDG_CONFIG_HOME` is not set then the file `$HOME/.config/containers/storage.conf` is used.
+Distributions often provide a `/usr/share/containers/storage.conf` file to define default storage configuration. Administrators can override this file by creating `/etc/containers/storage.conf` to specify their own configuration. Likewise rootless users can create a storage.conf file to override the system storage.conf files. Files should be stored in the `$XDG_CONFIG_HOME/containers/storage.conf` file.  If `$XDG_CONFIG_HOME` is not set then the file `$HOME/.config/containers/storage.conf` is used.
+
+Note: The storage.conf file overrides all other strorage.conf files. Container
+engines run by users with a storage.conf file in their home directory do not
+use options in the system storage.conf files.
 
 /etc/projects - XFS persistent project root definition
 /etc/projid -  XFS project name mapping file
diff --git a/shortnames.conf b/shortnames.conf
index 0f6827c..76f3015 100644
--- a/shortnames.conf
+++ b/shortnames.conf
@@ -1,4 +1,7 @@
 [aliases]
+  # almalinux
+  "almalinux" = "docker.io/library/almalinux"
+  "almalinux-minimal" = "docker.io/library/almalinux-minimal"
   # centos
   "centos" = "quay.io/centos/centos"
   # containers
diff --git a/storage.conf b/storage.conf
index 2afb9b0..4b44c38 100644
--- a/storage.conf
+++ b/storage.conf
@@ -1,5 +1,14 @@
 # This file is is the configuration file for all tools
-# that use the containers/storage library.
+# that use the containers/storage library. The storage.conf file
+# overrides all other storage.conf files. Container engines using the
+# container/storage library do not inherit fields from other storage.conf
+# files.
+#
+#  Note: The storage.conf file overrides other storage.conf files based on this precedence:
+#      /usr/containers/storage.conf
+#      /etc/containers/storage.conf
+#      $HOME/.config/containers/storage.conf
+#      $XDG_CONFIG_HOME/containers/storage.conf (If XDG_CONFIG_HOME is set)
 # See man 5 containers-storage.conf for more information
 # The "container storage" table contains all of the server options.
 [storage]