From fdcde7968a1afa62928fd42f0c3aa9fd9bc15137 Mon Sep 17 00:00:00 2001
From: Daniel Knittl-Frank <knittl89+git@googlemail.com>
Date: Mon, 26 Oct 2020 11:01:36 +0100
Subject: [PATCH] cli: use new prefixless config options in tools scripts

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>
---
 tools/packaging/release/kata-deploy-binaries.sh           | 8 ++++----
 .../static-build/scripts/kata-configure-docker.sh         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/packaging/release/kata-deploy-binaries.sh b/tools/packaging/release/kata-deploy-binaries.sh
index a900f51bb9..8ef778ee29 100755
--- a/tools/packaging/release/kata-deploy-binaries.sh
+++ b/tools/packaging/release/kata-deploy-binaries.sh
@@ -218,25 +218,25 @@ install_kata_components() {
 	pushd "${destdir}/${prefix}/bin"
 	cat <<EOT | sudo tee kata-fc
 #!/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
 	sudo chmod +x kata-fc
 
 	cat <<EOT | sudo tee kata-qemu
 #!/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
 	sudo chmod +x kata-qemu
 
 	cat <<EOT | sudo tee kata-clh
 #!/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
 	sudo chmod +x kata-clh
 
 	cat <<EOT | sudo tee kata-qemu-virtiofs
 #!/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
 	sudo chmod +x kata-qemu-virtiofs
 
diff --git a/tools/packaging/static-build/scripts/kata-configure-docker.sh b/tools/packaging/static-build/scripts/kata-configure-docker.sh
index b0f458d573..7c53090215 100644
--- a/tools/packaging/static-build/scripts/kata-configure-docker.sh
+++ b/tools/packaging/static-build/scripts/kata-configure-docker.sh
@@ -81,7 +81,7 @@ configure_docker()
 			--arg config "$config" \
 			--arg runtime "$runtime" \
 			--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"
 	done