github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-30 04:34:27 +00:00
Code Issues Projects Releases Wiki Activity

cli: use new prefixless config options in tools scripts

Browse Source 
Update all tools/packaging scripts to prefer the new options over the
old ones (e.g. `--config` instead of `--kata-config`).

Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com>
This commit is contained in:
Daniel Knittl-Frank 2020-10-26 11:01:36 +01:00
parent 02ee8b0b8a
commit fdcde7968a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/packaging/release/kata-deploy-binaries.sh
View File

@ -218,25 +218,25 @@ install_kata_components() {
pushd "${destdir}/${prefix}/bin" pushd "${destdir}/${prefix}/bin"
cat <<EOT | sudo tee kata-fc cat <<EOT | sudo tee kata-fc
#!/bin/bash #!/bin/bash
${prefix}/bin/kata-runtime --kata-config "${prefix}/share/defaults/${project}/configuration-fc.toml" \$@ ${prefix}/bin/kata-runtime --config "${prefix}/share/defaults/${project}/configuration-fc.toml" \$@
EOT EOT
sudo chmod +x kata-fc sudo chmod +x kata-fc
cat <<EOT | sudo tee kata-qemu cat <<EOT | sudo tee kata-qemu
#!/bin/bash #!/bin/bash
${prefix}/bin/kata-runtime --kata-config "${prefix}/share/defaults/${project}/configuration-qemu.toml" \$@ ${prefix}/bin/kata-runtime --config "${prefix}/share/defaults/${project}/configuration-qemu.toml" \$@
EOT EOT
sudo chmod +x kata-qemu sudo chmod +x kata-qemu
cat <<EOT | sudo tee kata-clh cat <<EOT | sudo tee kata-clh
#!/bin/bash #!/bin/bash
${prefix}/bin/kata-runtime --kata-config "${prefix}/share/defaults/${project}/configuration-clh.toml" \$@ ${prefix}/bin/kata-runtime --config "${prefix}/share/defaults/${project}/configuration-clh.toml" \$@
EOT EOT
sudo chmod +x kata-clh sudo chmod +x kata-clh
cat <<EOT | sudo tee kata-qemu-virtiofs cat <<EOT | sudo tee kata-qemu-virtiofs
#!/bin/bash #!/bin/bash
${prefix}/bin/kata-runtime --kata-config "${prefix}/share/defaults/${project}/configuration-qemu-virtiofs.toml" \$@ ${prefix}/bin/kata-runtime --config "${prefix}/share/defaults/${project}/configuration-qemu-virtiofs.toml" \$@
EOT EOT
sudo chmod +x kata-qemu-virtiofs sudo chmod +x kata-qemu-virtiofs

2
tools/packaging/static-build/scripts/kata-configure-docker.sh
View File

@ -81,7 +81,7 @@ configure_docker()
--arg config "$config" \ --arg config "$config" \
--arg runtime "$runtime" \ --arg runtime "$runtime" \
--arg runtime_path "$runtime_path" \ --arg runtime_path "$runtime_path" \
'.runtimes[$runtime] = {path: $runtime_path, "runtimeArgs": ["--kata-config", $config]}') '.runtimes[$runtime] = {path: $runtime_path, "runtimeArgs": ["--config", $config]}')
echo "$result" > "$docker_config_file" echo "$result" > "$docker_config_file"
done done