RPM: Update storage.conf patching

pull_options syntax has chagned recently. Ref: containers/storage#2066 Signed-off-by: Lokesh Mandvekar <[email protected]>
containers · Sep 3, 2024 · dd5e5ad · dd5e5ad
1 parent 46d7cf9
commit dd5e5ad
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/rpm/update-config-files.sh b/rpm/update-config-files.sh
@@ -54,11 +54,14 @@ if [[ -n "$FEDORA" ]] || [[ "$RHEL" -ge 10 ]]; then
     sed -i -e '/^additionalimagestores\ =\ \[/a "\/usr\/lib\/containers\/storage",' storage.conf
 fi
 
-# Set these on Fedora Rawhide (41+) and RHEL 10+
+# Set these on Fedora 41+ and RHEL 10+
 # regardless of distro
 if [[ "$FEDORA" -gt 40 ]] || [[ "$RHEL" -ge 10 ]]; then
-    ensure pkg/config/containers.conf   compression_format  \"zstd:chunked\"
-    ensure storage.conf pull_options    \{enable_partial_images\ =\ \"true\",\ use_hard_links\ =\ \"false\",\ ostree_repos=\"\",\ convert_images\ =\ \"false\"\}
+    ensure pkg/config/containers.conf   compression_format      \"zstd:chunked\"
+    ensure storage.conf                 enable_partial_images   \"true\"
+    ensure storage.conf                 ostree_repos            \"\"
+    ensure storage.conf                 use_hard_links          \"false\"
+    ensure storage.conf                 convert_images          \"false\"
     # Leave composefs disabled
-    ensure storage.conf use_composefs   \"false\"
+    ensure storage.conf                 use_composefs           \"false\"
 fi