containers.conf changes are common so far for all fedoras
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
This commit is contained in:
parent
1c296038d7
commit
2488e6c3e1
@ -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"/' \
|
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=""}/' \
|
-e 's/^pull_options.*=.*/pull_options = {enable_partial_images = \"true\", use_hard_links = \"false\", ostree_repos=""}/' \
|
||||||
storage.conf
|
storage.conf
|
||||||
sed -i -e 's/^#.*log_driver.*=.*/log_driver = "journald"/' \
|
|
||||||
containers.conf
|
|
||||||
else
|
else
|
||||||
sed -i -e 's/^driver.*=.*/driver = "overlay"/' -e 's/^mountopt.*=.*/mountopt = "nodev,metacopy=on"/' \
|
sed -i -e 's/^driver.*=.*/driver = "overlay"/' -e 's/^mountopt.*=.*/mountopt = "nodev,metacopy=on"/' \
|
||||||
-e '/additionalimage.*/a "/usr/lib/containers/storage",' \
|
-e '/additionalimage.*/a "/usr/lib/containers/storage",' \
|
||||||
storage.conf
|
storage.conf
|
||||||
sed -i -e 's/^#.*log_driver.*=.*/log_driver = "journald"/' \
|
|
||||||
containers.conf
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \
|
[ `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
|
echo -e '\nshort-name-mode="enforcing"' >> registries.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
sed -i -e 's/^#.*log_driver.*=.*/log_driver = "journald"/' \
|
||||||
|
containers.conf
|
||||||
|
|
||||||
git checkout origin default-policy.json
|
git checkout origin default-policy.json
|
||||||
|
Loading…
Reference in New Issue
Block a user