containers.conf changes are common so far for all fedoras

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
This commit is contained in:
Lokesh Mandvekar 2024-01-05 16:32:53 +05:30
parent 1c296038d7
commit 2488e6c3e1
No known key found for this signature in database
GPG Key ID: 1C1EDD7CC7C3A0DD

View File

@ -8,14 +8,10 @@ if [[ $(git rev-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
sed -i -e 's/^#.*log_driver.*=.*/log_driver = "journald"/' \
containers.conf
else
sed -i -e 's/^driver.*=.*/driver = "overlay"/' -e 's/^mountopt.*=.*/mountopt = "nodev,metacopy=on"/' \
-e '/additionalimage.*/a "/usr/lib/containers/storage",' \
storage.conf
sed -i -e 's/^#.*log_driver.*=.*/log_driver = "journald"/' \
containers.conf
fi
[ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \
@ -31,4 +27,7 @@ if [[ $? == 1 ]]; then
echo -e '\nshort-name-mode="enforcing"' >> registries.conf
fi
sed -i -e 's/^#.*log_driver.*=.*/log_driver = "journald"/' \
containers.conf
git checkout origin default-policy.json