From 456bc5ddac5698ec6e0da2ab56c86fb856bfddd4 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Fri, 10 Sep 2021 12:35:58 +0200
Subject: [PATCH] containers-common-1-4.el9

- fix updating scripts
- Related: #2000051

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

diff --git a/containers-common.spec b/containers-common.spec
index c9ff14e..acfcbed 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -13,7 +13,7 @@
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildArch: noarch
@@ -161,6 +161,10 @@ EOF
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Fri Sep 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-4
+- fix updating scripts
+- Related: #2000051
+
 * Thu Sep 09 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-3
 - update to the new vendored components
 - Related: #2000051
diff --git a/containers.conf b/containers.conf
index 50fa67c..d506578 100644
--- a/containers.conf
+++ b/containers.conf
@@ -368,7 +368,7 @@ events_logger = "file"
 # reserving the pods resources for the lifetime of the pod.
 #
 #infra_image = "k8s.gcr.io/pause:3.4.1"
-infra_image = "registry.access.redhat.com/ubi8/pause"
+infra_image = "registry.access.redhat.com/ubi9/pause"
 
 # 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
diff --git a/update-vendored.sh b/update-vendored.sh
index 1733a40..e273ba9 100755
--- a/update-vendored.sh
+++ b/update-vendored.sh
@@ -8,14 +8,13 @@ pwd | grep /tmp/centos > /dev/null
 if [ $? == 0 ]; then
   CENTOS=1
 fi
-set -xe
-echo $B
+set -e
 for P in podman skopeo buildah; do
   BRN=`pwd | sed 's,^.*/,,'`
   rm -rf $P
   pkg clone $P
   cd $P
-  [ ! -z "$CENTOS" ] && pkg switch-branch $B
+  [ -z "$CENTOS" ] && pkg switch-branch $BRN
   if [ $BRN != stream-container-tools-rhel8 ]; then
     pkg prep
   else
diff --git a/update.sh b/update.sh
index 81ff7a1..fce0ff4 100755
--- a/update.sh
+++ b/update.sh
@@ -33,7 +33,7 @@ ensure containers.conf runtime                       \"runc\"
 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 infra_image                   \"registry.access.redhat.com/ubi9/pause\"
 ensure containers.conf runtime                       \"crun\"
 fi
 [ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \