From 2dc2cf622b990548bcc270b527d3f6255df2a44b Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Wed, 29 Sep 2021 09:42:26 +0200
Subject: [PATCH] containers-common-1-7.el9

- update to the new vendored components
- Related: #2000051

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 containers-common.spec |  8 ++++++--
 containers.conf        | 25 +++++++++++++++++++------
 containers.conf.5.md   | 27 ++++++++++++++++++++-------
 3 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/containers-common.spec b/containers-common.spec
index 2dc8801..a51d289 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -6,14 +6,14 @@
 %global skopeo_branch main
 %global podman_branch main
 %global image_branch v5.16.0
-%global common_branch v0.45.0
+%global common_branch v0.46.0
 %global storage_branch v1.36.0
 %global shortnames_branch main
 
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildArch: noarch
@@ -161,6 +161,10 @@ EOF
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Wed Sep 29 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-7
+- update to the new vendored components
+- Related: #2000051
+
 * Wed Sep 29 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-6
 - add gating.yaml
 - Related: #2000051
diff --git a/containers.conf b/containers.conf
index 50e829b..8dc2919 100644
--- a/containers.conf
+++ b/containers.conf
@@ -399,10 +399,6 @@ infra_image = "registry.access.redhat.com/ubi9/pause"
 #
 #machine_enabled = false
 
-# The image used when creating a podman-machine VM.
-#
-#machine_image = "testing"
-
 # MultiImageArchive - if true, the container engine allows for storing archives
 # (e.g., of the docker-archive transport) with multiple images.  By default,
 # Podman creates single-image archives.
@@ -563,8 +559,25 @@ runtime = "crun"
 [engine.volume_plugins]
 #testplugin = "/run/podman/plugins/test.sock"
 
-# The [engine.volume_plugins] table MUST be the last entry in this file.
+[machine]
+# Number of CPU's a machine is created with.
+#
+#cpus=1
+
+# The size of the disk in GB created when init-ing a podman-machine VM.
+#
+#disk_size=10
+
+# The image used when creating a podman-machine VM.
+#
+#image = "testing"
+
+# Memory in MB a machine is created with.
+#
+#memory=2048
+
+# The [machine] table MUST be the last entry 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 [volume_plugins] and not the
+# defined, so every key hereafter will be part of [machine] and not the
 # main config.
diff --git a/containers.conf.5.md b/containers.conf.5.md
index b7b606f..1499211 100644
--- a/containers.conf.5.md
+++ b/containers.conf.5.md
@@ -47,8 +47,7 @@ TOML can be simplified to:
     option = value
 
 ## CONTAINERS TABLE
-The containers table contains settings pertaining to the OCI runtime that can
-configure and manage the OCI runtime.
+The containers table contains settings to configure and manage the OCI runtime.
 
 **annotations** = []
 List of annotations. Specified as "key=value" pairs to be added to all containers.
@@ -446,11 +445,6 @@ Indicates if Podman is running inside a VM via Podman Machine.
 Podman uses this value to do extra setup around networking from the
 container inside the VM to to host.
 
-**machine_image**="testing"
-
-Default image used when creating a new VM using `podman machine init`.
-Options: `testing`, `stable`, or a custom path or download URL to an image
-
 **multi_image_archive**=false
 
 Allows for creating archives (e.g., tarballs) with more than one image.  Some container engines, such as Podman, interpret additional arguments as tags for one image and hence do not store more than one image.  The default behavior can be altered with this option.
@@ -607,6 +601,25 @@ Currently valid values are:
 
 The driver specific options object.
 
+## MACHINE TABLE
+The `machine` table contains configurations for podman machine VMs
+
+**cpus**=1
+Number of CPU's a machine is created with.
+
+**disk_size**=10
+
+The size of the disk in GB created when init-ing a podman-machine VM
+
+**image**="testing"
+
+Default image used when creating a new VM using `podman machine init`.
+Options: `testing`, `stable`, `next`, or a custom path or download URL to an image
+
+**memory**=2048
+
+Memory in MB a machine is created with.
+
 # FILES
 
 **containers.conf**