From dd5e5adaf99b75abc282042ebcdc0febb10cfab0 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 3 Sep 2024 17:30:20 +0530 Subject: [PATCH] RPM: Update storage.conf patching pull_options syntax has chagned recently. Ref: https://github.com/containers/storage/pull/2066 Signed-off-by: Lokesh Mandvekar --- rpm/update-config-files.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rpm/update-config-files.sh b/rpm/update-config-files.sh index 216d8d42e..749548a08 100755 --- 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