From 0a797de0d4e95624fdc69c4b188c914c9076a4e2 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Sun, 28 Jan 2024 07:12:41 -0500
Subject: [PATCH] local build

---
 containers.conf | 2 +-
 storage.conf    | 3 ++-
 update.sh       | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/containers.conf b/containers.conf
index a9b4ca3..8c532f0 100644
--- a/containers.conf
+++ b/containers.conf
@@ -183,7 +183,7 @@ default_sysctls = [
 
 # Logging driver for the container. Available options: k8s-file and journald.
 #
-log_driver = "journald"
+#log_driver = "k8s-file"
 
 # Maximum size allowed for the container log file. Negative numbers indicate
 # that no size limit is imposed. If positive, it must be >= 8192 to match or
diff --git a/storage.conf b/storage.conf
index f15e18b..4296d34 100644
--- a/storage.conf
+++ b/storage.conf
@@ -48,6 +48,7 @@ graphroot = "/var/lib/containers/storage"
 # AdditionalImageStores is used to pass paths to additional Read/Only image stores
 # Must be comma separated list.
 additionalimagestores = [
+"/usr/lib/containers/storage",
 ]
 
 # Allows specification of how storage is populated when pulling images. This
@@ -70,7 +71,7 @@ additionalimagestores = [
 #     Tells containers/storage where an ostree repository exists that might have
 #     previously pulled content which can be used when attempting to avoid
 #     pulling content from the container registry
-pull_options = {enable_partial_images = "true", use_hard_links = "false", ostree_repos=""}
+pull_options = {enable_partial_images = "false", use_hard_links = "false", ostree_repos=""}
 
 # Remap-UIDs/GIDs is the mapping from UIDs/GIDs as they should appear inside of
 # a container, to the UIDs/GIDs as they should appear outside of the container,
diff --git a/update.sh b/update.sh
index 466feb0..7066c20 100755
--- a/update.sh
+++ b/update.sh
@@ -4,7 +4,7 @@ set -eox pipefail
 
 spectool -fg containers-common.spec
 
-if [[ $(git rev-parse --abbrev-ref HEAD) == "rawhide" ]]; then
+if [[ $(git reg-parse --abbrev-ref HEAD) == "rawhide" ]]; then
     sed -i -e 's/^driver.*=.*/driver = "overlay"/' -e 's/^mountopt.*=.*/mountopt = "nodev,metacopy=on"/' \
         -e 's/^pull_options.*=.*/pull_options = {enable_partial_images = \"true\", use_hard_links = \"false\", ostree_repos=""}/' \
         storage.conf
@@ -22,7 +22,7 @@ sed -i '/\"socketcall\",/i \
 sed -i 's/^#.*unqualified-search-registries.*=.*/unqualified-search-registries = ["registry.fedoraproject.org", "registry.access.redhat.com", "docker.io", "quay.io"]/g' \
         registries.conf
 
-grep '\nshort-name-mode="enforcing"' registries.conf
+grep 'short-name-mode="enforcing"' registries.conf
 if [[ $? == 1 ]]; then
     echo -e '\nshort-name-mode="enforcing"' >> registries.conf
 fi