Update to grab latest man pages and configuration files

2021-08-12 14:54:08 -04:00 · 2021-08-12 14:54:08 -04:00 · e7b409f3a5
commit e7b409f3a5
parent e64d9180a9
7 changed files with 221 additions and 156 deletions
--- a/containers-auth.json.5.md
+++ b/containers-auth.json.5.md
@ -21,14 +21,15 @@ Except the primary (read/write) file, other files are read-only, unless the user
 The auth.json file stores encrypted authentication information for the
 user to container image registries.  The file can have zero to many entries and
 is created by a `login` command from a container tool such as `podman login`,
-`buildah login` or `skopeo login`.  Each entry includes the name of the registry and then an auth
-token in the form of a base64 encoded string from the concatenation of the
-username, a colon, and the password. The registry name can additionally contain
-a path or repository name (an image name without tag or digest). The path (or
-namespace) is matched in its hierarchical order when checking for available
-authentications. For example, an image pull for
-`my-registry.local/namespace/user/image:latest` will result in a lookup in
-`auth.json` in the following order:
+`buildah login` or `skopeo login`. Each entry either contains a single
+hostname (e.g. `docker.io`) or a namespace (e.g. `quay.io/user/image`) as a key
+and an auth token in the form of a base64 encoded string as value of `auth`. The
+token is built from the concatenation of the username, a colon, and the
+password. The registry name can additionally contain a repository name (an image
+name without tag or digest) and namespaces. The path (or namespace) is matched
+in its hierarchical order when checking for available authentications. For
+example, an image pull for `my-registry.local/namespace/user/image:latest` will
+result in a lookup in `auth.json` in the following order:

 - `my-registry.local/namespace/user/image`
 - `my-registry.local/namespace/user`
--- a/containers-common.spec
+++ b/containers-common.spec
@ -15,7 +15,7 @@
 Epoch: 4
 Name: containers-common
 Version: 1
-Release: 24%{?dist}
+Release: 25%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildArch: noarch
@ -150,6 +150,9 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
 %{_datadir}/rhel/secrets/*

 %changelog
+* Thu Aug 12 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-25
+- Update to grab latest man pages and configuration files
+
 * Mon Jul 26 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-24
 - Add support for signed RHEL images, enabled by default

--- a/containers-storage.conf.5.md
+++ b/containers-storage.conf.5.md
@ -174,6 +174,9 @@ The `storage.options.overlay` table supports the following options:
 **ignore_chown_errors** = "false"
  ignore_chown_errors can be set to allow a non privileged user running with a  single UID within a user namespace to run containers. The user can pull and use any image even those with multiple uids.  Note multiple UIDs will be squashed down to the default uid in the container.  These images will have no separation between the users in the container. (default: false)

+**inodes**=""
+  Maximum inodes in a read/write layer.   This flag can be used to set a quota on the inodes allocated for a read/write layer of a container.
+
 **force_mask** = "0000|shared|private"
  ForceMask specifies the permissions mask that is used for new files and
 directories.
@ -220,7 +223,7 @@ based file systems.
  Comma separated list of default options to be used to mount container images.  Suggested value "nodev". Mount options are documented in the mount(8) man page.

 **size**=""
-  Maximum size of a container image.   This flag can be used to set quota on the size of container images. (format: <number>[<unit>], where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes))
+  Maximum size of a read/write layer.   This flag can be used to set quota on the size of a read/write layer of a container. (format: <number>[<unit>], where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes))

 ### STORAGE OPTIONS FOR VFS TABLE

@ -260,13 +263,45 @@ The semanage command above tells SELinux to setup the default labeling of `NEWST

 Now all new content created in these directories will automatically be created with the correct label.

-## SEE ALSO
-`semanage(8)`, `restorecon(8)`, `mount(8)`, `fuse-overlayfs(1)`
+## QUOTAS
+
+Container storage implements `XFS project quota controls` for overlay storage
+containers and volumes. The directory used to store the containers must be an
+`XFS` file system and be mounted with the `pquota` option.
+
+Example /etc/fstab entry:
+```
+/dev/podman/podman-var /var xfs defaults,x-systemd.device-timeout=0,pquota 1 2
+```
+
+Container storage generates project ids for each container and builtin volume, but these project ids need to be unique for the XFS file system.
+
+The xfs_quota tool can be used to assign a project id to the storage driver directory, e.g.:
+
+```
+echo 100000:/var/lib/containers/storage/overlay >> /etc/projects
+echo 200000:/var/lib/containers/storage/volumes >> /etc/projects
+echo storage:100000 >> /etc/projid
+echo volumes:200000 >> /etc/projid
+xfs_quota -x -c 'project -s storage volumes' /<xfs mount point>
+```
+
+In the example above, the storage directory project id will be used as a "start offset"
+and all containers will be assigned larger project ids (e.g. >= 100000).
+Then the volumes directory project id will be used as a "start offset"
+and all volumes will be assigned larger project ids (e.g. >= 200000).
+This is a way to prevent xfs_quota management from conflicting with containers/storage.

 ## 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.

+/etc/projects - XFS persistent project root definition
+/etc/projid -  XFS project name mapping file
+
+## SEE ALSO
+`semanage(8)`, `restorecon(8)`, `mount(8)`, `fuse-overlayfs(1)`, `xfs_quota(8)`, `projects(5)`, `projid(5)`
+
 ## HISTORY
 May 2017, Originally compiled by Dan Walsh <dwalsh@redhat.com>
 Format copied from crio.conf man page created by Aleksa Sarai <asarai@suse.de>
--- a/containers.conf
+++ b/containers.conf
@ -20,18 +20,18 @@
 # "key = value"
 # If it is empty or commented out, no annotations will be added
 #
-# annotations = []
+#annotations = []

 # Used to change the name of the default AppArmor profile of container engine.
 #
-# apparmor_profile = "container-default"
+#apparmor_profile = "container-default"

 # Default way to to create a cgroup namespace for the container
 # Options are:
 # `private` Create private Cgroup Namespace for the container.
 # `host`    Share host Cgroup Namespace with the container.
 #
-# cgroupns = "private"
+#cgroupns = "private"

 # Control container cgroup configuration
 # Determines  whether  the  container will create CGroups.
@ -40,31 +40,31 @@
 # `disabled`  Disable cgroup support, will inherit cgroups from parent
 # `no-conmon` Do not create a cgroup dedicated to conmon.
 #
-# cgroups = "enabled"
+#cgroups = "enabled"

 # List of default capabilities for containers. If it is empty or commented out,
 # the default capabilities defined in the container engine will be added.
 #
 default_capabilities = [
-    "CHOWN",
-    "DAC_OVERRIDE",
-    "FOWNER",
-    "FSETID",
-    "KILL",
-    "NET_BIND_SERVICE",
-    "SETFCAP",
-    "SETGID",
-    "SETPCAP",
-    "SETUID",
-    "SYS_CHROOT"
+  "CHOWN",
+  "DAC_OVERRIDE",
+  "FOWNER",
+  "FSETID",
+  "KILL",
+  "NET_BIND_SERVICE",
+  "SETFCAP",
+  "SETGID",
+  "SETPCAP",
+  "SETUID",
+  "SYS_CHROOT"
 ]

 # A list of sysctls to be set in containers by default,
 # specified as "name=value",
-# for example:"net.ipv4.ping_group_range = 0 0".
+# for example:"net.ipv4.ping_group_range=0 0".
 #
 default_sysctls = [
- "net.ipv4.ping_group_range=0 0",
+  "net.ipv4.ping_group_range=0 0",
 ]

 # A list of ulimits to be set in containers by default, specified as
@ -75,24 +75,24 @@ default_sysctls = [
 # container engine.
 # Ulimits has limits for non privileged container engines.
 #
-# default_ulimits = [
+#default_ulimits = [
 #  "nofile=1280:2560",
-# ]
+#]

 # List of devices. Specified as
 # "<device-on-host>:<device-on-container>:<permissions>", for example:
 # "/dev/sdc:/dev/xvdc:rwm".
 # If it is empty or commented out, only the default devices will be used
 #
-# devices = []
+#devices = []

 # List of default DNS options to be added to /etc/resolv.conf inside of the container.
 #
-# dns_options = []
+#dns_options = []

 # List of default DNS search domains to be added to /etc/resolv.conf inside of the container.
 #
-# dns_searches = []
+#dns_searches = []

 # Set default DNS servers.
 # This option can be used to override the DNS configuration passed to the
@ -100,19 +100,19 @@ default_sysctls = [
 # /etc/resolv.conf in the container.
 # The /etc/resolv.conf file in the image will be used without changes.
 #
-# dns_servers = []
+#dns_servers = []

 # Environment variable list for the conmon process; used for passing necessary
 # environment variables to conmon or the runtime.
 #
-# env = [
-#    "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-#    "TERM=xterm",
-# ]
+#env = [
+#  "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+#  "TERM=xterm",
+#]

 # Pass all host environment variables into the container.
 #
-# env_host = false
+#env_host = false

 # Default proxy environment variables passed into the container.
 # The environment variables passed in include:
@ -121,32 +121,33 @@ default_sysctls = [
 # should not use proxy. Proxy environment variables specified for the container
 # in any other way will override the values passed from the host.
 #
-# http_proxy = true
+#http_proxy = true

 # Run an init inside the container that forwards signals and reaps processes.
 #
-# init = false
+#init = false

-#  Container init binary, if init=true, this is the init binary to be used for containers.
+# Container init binary, if init=true, this is the init binary to be used for containers.
 #
-# init_path = "/usr/libexec/podman/catatonit"
+#init_path = "/usr/libexec/podman/catatonit"

 # Default way to to create an IPC namespace (POSIX SysV IPC) for the container
 # Options are:
 # `private` Create private IPC Namespace for the container.
 # `host`    Share host IPC Namespace with the container.
 #
-# ipcns = "private"
+#ipcns = "private"

 # keyring tells the container engine whether to create
 # a kernel keyring for use within the container.
-# keyring = true
+#
+#keyring = true

 # label tells the container engine whether to use container separation using
 # MAC(SELinux) labeling or not.
 # The label flag is ignored on label disabled systems.
 #
-# label = true
+#label = true

 # Logging driver for the container. Available options: k8s-file and journald.
 #
@ -157,13 +158,13 @@ log_driver = "journald"
 # exceed conmon's read buffer. The file is truncated and re-opened so the
 # limit is never exceeded.
 #
-# log_size_max = -1
+#log_size_max = -1

 # Specifies default format tag for container log messages.
 # This is useful for creating a specific tag for container log messages.
 # Containers logs default to truncated container ID as a tag.
 #
-# log_tag = ""
+#log_tag = ""

 # Default way to to create a Network namespace for the container
 # Options are:
@ -171,143 +172,147 @@ log_driver = "journald"
 # `host`    Share host Network Namespace with the container.
 # `none`    Containers do not use the network
 #
-# netns = "private"
+#netns = "private"

 # Create /etc/hosts for the container.  By default, container engine manage
 # /etc/hosts, automatically adding  the container's  own  IP  address.
 #
-# no_hosts = false
+#no_hosts = false

 # Default way to to create a PID namespace for the container
 # Options are:
 # `private` Create private PID Namespace for the container.
 # `host`    Share host PID Namespace with the container.
 #
-# pidns = "private"
+#pidns = "private"

 # Maximum number of processes allowed in a container.
 #
-# pids_limit = 2048
+#pids_limit = 2048

 # Copy the content from the underlying image into the newly created volume
 # when the container is created instead of when it is started. If false,
 # the container engine will not copy the content until the container is started.
 # Setting it to true may have negative performance implications.
 #
-# prepare_volume_on_create = false
+#prepare_volume_on_create = false

 # Indicates the networking to be used for rootless containers
-# rootless_networking = "slirp4netns"
+#
+#rootless_networking = "slirp4netns"

 # Path to the seccomp.json profile which is used as the default seccomp profile
 # for the runtime.
 #
-# seccomp_profile = "/usr/share/containers/seccomp.json"
+#seccomp_profile = "/usr/share/containers/seccomp.json"

 # Size of /dev/shm. Specified as <number><unit>.
 # Unit is optional, values:
 # b (bytes), k (kilobytes), m (megabytes), or g (gigabytes).
 # If the unit is omitted, the system uses bytes.
 #
-# shm_size = "65536k"
+#shm_size = "65536k"

 # Set timezone in container. Takes IANA timezones as well as "local",
 # which sets the timezone in the container to match the host machine.
 #
-# tz = ""
+#tz = ""

 # Set umask inside the container
 #
-# umask = "0022"
+#umask = "0022"

 # Default way to to create a User namespace for the container
 # Options are:
 # `auto`        Create unique User Namespace for the container.
 # `host`    Share host User Namespace with the container.
 #
-# userns = "host"
+#userns = "host"

 # Number of UIDs to allocate for the automatic container creation.
 # UIDs are allocated from the "container" UIDs listed in
 # /etc/subuid & /etc/subgid
 #
-# userns_size = 65536
+#userns_size = 65536

 # Default way to to create a UTS namespace for the container
 # Options are:
 # `private`        Create private UTS Namespace for the container.
 # `host`    Share host UTS Namespace with the container.
 #
-# utsns = "private"
+#utsns = "private"

 # List of volumes. Specified as
 # "<directory-on-host>:<directory-in-container>:<options>", for example:
 # "/db:/var/lib/db:ro".
 # If it is empty or commented out, no volumes will be added
 #
-# volumes = []
+#volumes = []

 # The network table contains settings pertaining to the management of
 # CNI plugins.

 [secrets]
-# driver = "file"
+#driver = "file"

 [secrets.opts]
-# root = "/example/directory"
+#root = "/example/directory"

 [network]

 # Path to directory where CNI plugin binaries are located.
 #
-# cni_plugin_dirs = ["/usr/libexec/cni"]
+#cni_plugin_dirs = ["/usr/libexec/cni"]

 # The network name of the default CNI network to attach pods to.
-# default_network = "podman"
+#
+#default_network = "podman"

 # The default subnet for the default CNI network given in default_network.
 # If a network with that name does not exist, a new network using that name and
 # this subnet will be created.
 # Must be a valid IPv4 CIDR prefix.
+#
 #default_subnet = "10.88.0.0/16"

 # Path to the directory where CNI configuration files are located.
 #
-# network_config_dir = "/etc/cni/net.d/"
+#network_config_dir = "/etc/cni/net.d/"

 [engine]
 # Index to the active service
-# active_service = production
+#
+#active_service = production

 # Cgroup management implementation used for the runtime.
 # Valid options "systemd" or "cgroupfs"
 #
-# cgroup_manager = "systemd"
+#cgroup_manager = "systemd"

 # Environment variables to pass into conmon
 #
-# conmon_env_vars = [
-#        "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-# ]
+#conmon_env_vars = [
+#  "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+#]

 # Paths to look for the conmon container manager binary
 #
-# conmon_path = [
-#        "/usr/libexec/podman/conmon",
-#        "/usr/local/libexec/podman/conmon",
-#        "/usr/local/lib/podman/conmon",
-#        "/usr/bin/conmon",
-#        "/usr/sbin/conmon",
-#        "/usr/local/bin/conmon",
-#        "/usr/local/sbin/conmon"
-# ]
+#conmon_path = [
+#  "/usr/libexec/podman/conmon",
+#  "/usr/local/libexec/podman/conmon",
+#  "/usr/local/lib/podman/conmon",
+#  "/usr/bin/conmon",
+#  "/usr/sbin/conmon",
+#  "/usr/local/bin/conmon",
+#  "/usr/local/sbin/conmon"
+#]

 # Specify the keys sequence used to detach a container.
 # Format is a single character [a-Z] or a comma separated sequence of
 # `ctrl-<value>`, where `<value>` is one of:
 # `a-z`, `@`, `^`, `[`, `\`, `]`, `^` or `_`
 #
-# detach_keys = "ctrl-p,ctrl-q"
+#detach_keys = "ctrl-p,ctrl-q"

 # Determines whether engine will reserve ports on the host when they are
 # forwarded to containers. When enabled, when ports are forwarded to containers,
@ -316,48 +321,51 @@ log_driver = "journald"
 # significant memory usage if a container has many ports forwarded to it.
 # Disabling this can save memory.
 #
-# enable_port_reservation = true
+#enable_port_reservation = true

 # Environment variables to be used when running the container engine (e.g., Podman, Buildah).
 # For example "http_proxy=internal.proxy.company.com".
 # Note these environment variables will not be used within the container.
 # Set the env section under [containers] table, if you want to set environment variables for the container.
-# env = []
+#
+#env = []

 # Selects which logging mechanism to use for container engine events.
 # Valid values are `journald`, `file` and `none`.
 #
-# events_logger = "journald"
+#events_logger = "journald"

 # Path to OCI hooks directories for automatically executed hooks.
 #
-# hooks_dir = [
-#     "/usr/share/containers/oci/hooks.d",
-# ]
+#hooks_dir = [
+#  "/usr/share/containers/oci/hooks.d",
+#]

 # Manifest Type (oci, v2s2, or v2s1) to use when pulling, pushing, building
 # container images. By default image pulled and pushed match the format of the
 # source image. Building/committing defaults to OCI.
-# image_default_format = ""
+#
+#image_default_format = ""

 # Default transport method for pulling and pushing for images
 #
-# image_default_transport = "docker://"
+#image_default_transport = "docker://"

 # Maximum number of image layers to be copied (pulled/pushed) simultaneously.
 # Not setting this field, or setting it to zero, will fall back to containers/image defaults.
-# image_parallel_copies = 0
+#
+#image_parallel_copies = 0

 # Default command to run the infra container
 #
-# infra_command = "/pause"
+#infra_command = "/pause"

 # Infra (pause) container image name for pod infra containers.  When running a
 # pod, we start a `pause` process in a container to hold open the namespaces
 # associated with the  pod.  This container does nothing other then sleep,
 # reserving the pods resources for the lifetime of the pod.
 #
-# infra_image = "k8s.gcr.io/pause:3.4.1"
+#infra_image = "k8s.gcr.io/pause:3.4.1"

 # Specify the locking mechanism to use; valid values are "shm" and "file".
 # Change the default only if you are sure of what you are doing, in general
@ -365,18 +373,23 @@ log_driver = "journald"
 # faster "shm" lock type.  You may need to run "podman system renumber" after
 # you change the lock type.
 #
-# lock_type** = "shm"
+#lock_type** = "shm"

 # 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_enabled = false
+#
+#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.
 #
-# multi_image_archive = "false"
+#multi_image_archive = "false"

 # Default engine namespace
 # If engine is joined to a namespace, it will see only containers and pods
@ -385,131 +398,136 @@ log_driver = "journald"
 # The default namespace is "", which corresponds to no namespace. When no
 # namespace is set, all containers and pods are visible.
 #
-# namespace = ""
+#namespace = ""

 # Path to the slirp4netns binary
 #
-# network_cmd_path = ""
+#network_cmd_path = ""

 # Default options to pass to the slirp4netns binary.
 # For example "allow_host_loopback=true"
 #
-# network_cmd_options = []
+#network_cmd_options = []

 # Whether to use chroot instead of pivot_root in the runtime
 #
-# no_pivot_root = false
+#no_pivot_root = false

 # Number of locks available for containers and pods.
 # If this is changed, a lock renumber must be performed (e.g. with the
 # 'podman system renumber' command).
 #
-# num_locks = 2048
+#num_locks = 2048

 # Whether to pull new image before running a container
-# pull_policy = "missing"
+#
+#pull_policy = "missing"

 # Indicates whether the application should be running in remote mode. This flag modifies the
 # --remote option on container engines. Setting the flag to true will default
 # `podman --remote=true` for access to the remote Podman service.
-# remote = false
+#
+#remote = false

 # Default OCI runtime
 #
-# runtime = "crun"
+#runtime = "crun"

 # List of the OCI runtimes that support --format=json.  When json is supported
 # engine will use it for reporting nicer errors.
 #
-# runtime_supports_json = ["crun", "runc", "kata", "runsc"]
+#runtime_supports_json = ["crun", "runc", "kata", "runsc"]

 # List of the OCI runtimes that supports running containers with KVM Separation.
 #
-# runtime_supports_kvm = ["kata"]
+#runtime_supports_kvm = ["kata"]

 # List of the OCI runtimes that supports running containers without cgroups.
 #
-# runtime_supports_nocgroups = ["crun"]
+#runtime_supports_nocgroups = ["crun"]

 # Directory for persistent engine files (database, etc)
 # By default, this will be configured relative to where the containers/storage
 # stores containers
 # Uncomment to change location from this default
 #
-# static_dir = "/var/lib/containers/storage/libpod"
+#static_dir = "/var/lib/containers/storage/libpod"

 # Number of seconds to wait for container to exit before sending kill signal.
-# stop_timeout = 10
+#
+#stop_timeout = 10

 # map of service destinations
-# [service_destinations]
-#   [service_destinations.production]
+#
+#[service_destinations]
+#  [service_destinations.production]
 #     URI to access the Podman service
 #     Examples:
 #       rootless "unix://run/user/$UID/podman/podman.sock" (Default)
 #       rootfull "unix://run/podman/podman.sock (Default)
 #       remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock
 #       remote rootfull ssh://root@10.10.1.136:22/run/podman/podman.sock
-#     uri = "ssh://user@production.example.com/run/user/1001/podman/podman.sock"
-#     Path to file containing ssh identity key
-#     identity = "~/.ssh/id_rsa"
+#
+#    uri = "ssh://user@production.example.com/run/user/1001/podman/podman.sock"
+#    Path to file containing ssh identity key
+#    identity = "~/.ssh/id_rsa"

 # Directory for temporary files. Must be tmpfs (wiped after reboot)
 #
-# tmp_dir = "/run/libpod"
+#tmp_dir = "/run/libpod"

 # Directory for libpod named volumes.
 # By default, this will be configured relative to where containers/storage
 # stores containers.
 # Uncomment to change location from this default.
 #
-# volume_path = "/var/lib/containers/storage/volumes"
+#volume_path = "/var/lib/containers/storage/volumes"

 # Paths to look for a valid OCI runtime (crun, runc, kata, runsc, etc)
 [engine.runtimes]
-# crun = [
-#            "/usr/bin/crun",
-#            "/usr/sbin/crun",
-#            "/usr/local/bin/crun",
-#            "/usr/local/sbin/crun",
-#            "/sbin/crun",
-#            "/bin/crun",
-#            "/run/current-system/sw/bin/crun",
-# ]
+#crun = [
+#  "/usr/bin/crun",
+#  "/usr/sbin/crun",
+#  "/usr/local/bin/crun",
+#  "/usr/local/sbin/crun",
+#  "/sbin/crun",
+#  "/bin/crun",
+#  "/run/current-system/sw/bin/crun",
+#]

-# kata = [
-#            "/usr/bin/kata-runtime",
-#            "/usr/sbin/kata-runtime",
-#            "/usr/local/bin/kata-runtime",
-#            "/usr/local/sbin/kata-runtime",
-#            "/sbin/kata-runtime",
-#            "/bin/kata-runtime",
-#            "/usr/bin/kata-qemu",
-#            "/usr/bin/kata-fc",
-# ]
+#kata = [
+#  "/usr/bin/kata-runtime",
+#  "/usr/sbin/kata-runtime",
+#  "/usr/local/bin/kata-runtime",
+#  "/usr/local/sbin/kata-runtime",
+#  "/sbin/kata-runtime",
+#  "/bin/kata-runtime",
+#  "/usr/bin/kata-qemu",
+#  "/usr/bin/kata-fc",
+#]

-# runc = [
-#        "/usr/bin/runc",
-#        "/usr/sbin/runc",
-#        "/usr/local/bin/runc",
-#        "/usr/local/sbin/runc",
-#        "/sbin/runc",
-#        "/bin/runc",
-#        "/usr/lib/cri-o-runc/sbin/runc",
-# ]
+#runc = [
+#  "/usr/bin/runc",
+#  "/usr/sbin/runc",
+#  "/usr/local/bin/runc",
+#  "/usr/local/sbin/runc",
+#  "/sbin/runc",
+#  "/bin/runc",
+#  "/usr/lib/cri-o-runc/sbin/runc",
+#]

-# runsc = [
-#            "/usr/bin/runsc",
-#            "/usr/sbin/runsc",
-#            "/usr/local/bin/runsc",
-#            "/usr/local/sbin/runsc",
-#            "/bin/runsc",
-#            "/sbin/runsc",
-#            "/run/current-system/sw/bin/runsc",
-# ]
+#runsc = [
+#  "/usr/bin/runsc",
+#  "/usr/sbin/runsc",
+#  "/usr/local/bin/runsc",
+#  "/usr/local/sbin/runsc",
+#  "/bin/runsc",
+#  "/sbin/runsc",
+#  "/run/current-system/sw/bin/runsc",
+#]

 [engine.volume_plugins]
-# testplugin = "/run/podman/plugins/test.sock"
+#testplugin = "/run/podman/plugins/test.sock"

 # The [engine.volume_plugins] table MUST be the last entry in this file.
 # (Unless another table is added)
--- a/containers.conf.5.md
+++ b/containers.conf.5.md
@ -412,6 +412,11 @@ 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.
--- a/shortnames.conf
+++ b/shortnames.conf
@ -56,7 +56,7 @@
  # Ubuntu
  "ubuntu" = "docker.io/library/ubuntu"
  # Oracle Linux
-  "oraclelinux" = "docker.io/library/oraclelinux"
+  "oraclelinux" = "container-registry.oracle.com/os/oraclelinux"
  # busybox
  "busybox" = "docker.io/library/busybox"
  # php
--- a/storage.conf
+++ b/storage.conf
@ -69,6 +69,9 @@ additionalimagestores = [
 # and vfs drivers.
 #ignore_chown_errors = "false"

+# Inodes is used to set a maximum inodes of the container image.
+# inodes = ""
+
 # Path to an helper program to use for mounting the file system instead of mounting it
 # directly.
 #mount_program = "/usr/bin/fuse-overlayfs"