From 8234f9a832ca74c44e6d1677cc39160b26424b81 Mon Sep 17 00:00:00 2001
From: Salvador Fuentes <salvador.fuentes@intel.com>
Date: Tue, 15 Oct 2019 15:12:42 -0500
Subject: [PATCH 1/2] kata-deploy: Add qemu-virtiofs to containerd
 configuration

We need an entry of `kata-qemu-virtiofs` on the
containerd configuration file.
In addition we need to add `kata-qemu-virtiofs` to the
shim list, so that the wrapper is created for shimv2.

Fixes: #760.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
---
 kata-deploy/scripts/kata-deploy.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/kata-deploy/scripts/kata-deploy.sh b/kata-deploy/scripts/kata-deploy.sh
index 83afa8a566..9b1bff3442 100755
--- a/kata-deploy/scripts/kata-deploy.sh
+++ b/kata-deploy/scripts/kata-deploy.sh
@@ -14,9 +14,10 @@ containerd_conf_file="/etc/containerd/config.toml"
 containerd_conf_file_backup="${containerd_conf_file}.bak"
 
 shims=(
-	"qemu"
-	"nemu"
 	"fc"
+	"nemu"
+	"qemu"
+	"qemu-virtiofs"
 )
 
 # If we fail for any reason a message will be displayed
@@ -93,7 +94,7 @@ EOT
 	else
 		cat <<EOT | tee -a "$crio_conf_file"
 
-# Path to the Kata Containers runtime binary that uses the QEMU hypervisor.
+# Path to the Kata Containers runtime binary that uses the QEMU hypervisor with virtiofs support.
 [$kata_qemu_conf]
   runtime_path = "${kata_qemu_virtiofs_path}"
 EOT
@@ -160,6 +161,10 @@ function configure_containerd() {
         runtime_type = "io.containerd.kata-qemu.v2"
         [plugins.cri.containerd.runtimes.kata-qemu.options]
 	      ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration-qemu.toml"
+     [plugins.cri.containerd.runtimes.kata-qemu-virtiofs]
+        runtime_type = "io.containerd.kata-qemu-virtiofs.v2"
+        [plugins.cri.containerd.runtimes.kata-qemu-virtiofs.options]
+	      ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration-qemu-virtiofs.toml"
      [plugins.cri.containerd.runtimes.kata-nemu]
         runtime_type = "io.containerd.kata-nemu.v2"
         [plugins.cri.containerd.runtimes.kata-nemu.options]

From eea8cea804b45897cd08fc14dd1ff9f8e0dbb2e8 Mon Sep 17 00:00:00 2001
From: Salvador Fuentes <salvador.fuentes@intel.com>
Date: Tue, 15 Oct 2019 15:25:37 -0500
Subject: [PATCH 2/2] kata-deploy: Fix indentation issues.

Fix indentation issues on `kata-deploy.sh` file.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
---
 kata-deploy/scripts/kata-deploy.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kata-deploy/scripts/kata-deploy.sh b/kata-deploy/scripts/kata-deploy.sh
index 9b1bff3442..4e64ade954 100755
--- a/kata-deploy/scripts/kata-deploy.sh
+++ b/kata-deploy/scripts/kata-deploy.sh
@@ -100,7 +100,6 @@ EOT
 EOT
         fi
 
-
 	# add kata-nemu config
 	if grep -q "^\[$kata_nemu_conf\]" $crio_conf_file; then
 		echo "Configuration exists $kata_nemu_conf, overwriting"
@@ -172,7 +171,7 @@ function configure_containerd() {
 EOT
 	#Currently containerd has an assumption on the location of the shimv2 implementation
 	#Until support is added (see https://github.com/containerd/containerd/issues/3073),
-    #create a link in /usr/local/bin/ to the v2-shim implementation in /opt/kata/bin.
+	#create a link in /usr/local/bin/ to the v2-shim implementation in /opt/kata/bin.
 
 	mkdir -p /usr/local/bin
 
@@ -193,7 +192,7 @@ EOT
 #!/bin/bash
 KATA_CONF_FILE=/opt/kata/share/defaults/kata-containers/configuration-${shim}.toml /opt/kata/bin/containerd-shim-kata-v2 \$@
 EOT
-       chmod +x $shim_file
+	chmod +x $shim_file
 	done
 }