From 2488e6c3e1f93d75fa346343aad325424225fa76 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 5 Jan 2024 16:32:53 +0530 Subject: [PATCH] containers.conf changes are common so far for all fedoras Signed-off-by: Lokesh Mandvekar --- update.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/update.sh b/update.sh index 7ceafbc..466feb0 100755 --- a/update.sh +++ b/update.sh @@ -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