github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-31 07:19:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #929 from grahamwhaley/20200212_deploy_fixes

Browse Source 
kata-deploy: improve logic for crio.conf runtime additions
This commit is contained in:
James O. D. Hunt 2020-02-25 10:52:30 +00:00 committed by GitHub
commit 9a37ebec66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kata-deploy/scripts/kata-deploy.sh
View File

@ -87,7 +87,7 @@ function configure_crio() {
local kata_qemu_virtiofs_conf="crio.runtime.runtimes.kata-qemu-virtiofs"
# add kata-qemu config
if grep -q "\[$kata_qemu_conf\]" $crio_conf_file; then
if grep -qEe "^\[$kata_qemu_conf\]" $crio_conf_file; then
echo "Configuration exists $kata_qemu_conf, overwriting"
sed -i "/\[$kata_qemu_conf\]/,+1s#runtime_path.*#runtime_path = \"${kata_qemu_path}\"#" $crio_conf_file
else
@ -100,7 +100,7 @@ EOT
fi
# add kata-qemu-virtiofs config
if grep -q "\[$kata_qemu_virtiofs_conf\]" $crio_conf_file; then
if grep -qEe "^\[$kata_qemu_virtiofs_conf\]" $crio_conf_file; then
echo "Configuration exists $kata_qemu_virtiofs_conf, overwriting"
sed -i "/\[$kata_qemu_virtiofs_conf\]/,+1s#runtime_path.*#runtime_path = \"${kata_qemu_virtiofs_path}\"#" $crio_conf_file
else
@ -113,7 +113,7 @@ EOT
fi
# add kata-fc config
if grep -q "\[$kata_fc_conf\]" $crio_conf_file; then
if grep -qEe "^\[$kata_fc_conf\]" $crio_conf_file; then
echo "Configuration exists for $kata_fc_conf, overwriting"
sed -i "/\[$kata_fc_conf\]/,+1s#runtime_path.*#runtime_path = \"${kata_fc_path}\"#" $crio_conf_file
else
@ -126,7 +126,7 @@ EOT
fi
# add kata-clh config
if grep -q "\[$kata_clh_conf\]" $crio_conf_file; then
if grep -qEe "^\[$kata_clh_conf\]" $crio_conf_file; then
echo "Configuration exists $kata_clh_conf, overwriting"
sed -i "/\[$kata_clh_conf\]/,+1s#runtime_path.*#runtime_path = \"${kata_clh_path}\"#" $crio_conf_file
else