RPM: Update storage.conf patching

storage.conf has been updated upstream so the config files update script needs to account for that. Ref: containers/storage#2066 Signed-off-by: Lokesh Mandvekar <[email protected]>
containers · Sep 5, 2024 · c65b9c5 · c65b9c5
1 parent 08f9c11
commit c65b9c5
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/rpm/update-config-files.sh b/rpm/update-config-files.sh
@@ -54,11 +54,10 @@ 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\"\}
     # Leave composefs disabled
     ensure storage.conf use_composefs   \"false\"
 fi