3 files changed, 22 insertions, 23 deletions
diff --git a/tools/installers/BUILD b/tools/installers/BUILD
index 13d3cc5e0..d9f9c4c40 100644
--- a/tools/installers/BUILD
+++ b/tools/installers/BUILD
@@ -1,4 +1,4 @@
-# Installers for use by the tools/vm_test rules.
+# Installers for use by top-level scripts.
 
 package(
     default_visibility = ["//:sandbox"],
@@ -14,14 +14,6 @@ sh_binary(
 )
 
 sh_binary(
-    name = "images",
-    srcs = ["images.sh"],
-    data = [
-        "//images",
-    ],
-)
-
-sh_binary(
     name = "master",
     srcs = ["master.sh"],
 )
@@ -35,7 +27,6 @@ sh_binary(
     name = "shim",
     srcs = ["shim.sh"],
     data = [
-        "//shim/v1:gvisor-containerd-shim",
-        "//shim/v2:containerd-shim-runsc-v1",
+        "//shim:containerd-shim-runsc-v1",
     ],
 )
diff --git a/tools/installers/containerd.sh b/tools/installers/containerd.sh
index 6b7bb261c..e598bce89 100755
--- a/tools/installers/containerd.sh
+++ b/tools/installers/containerd.sh
@@ -16,7 +16,7 @@
 
 set -xeo pipefail
 
-declare -r CONTAINERD_VERSION=${CONTAINERD_VERSION:-1.3.0}
+declare -r CONTAINERD_VERSION=${1:-1.3.0}
 declare -r CONTAINERD_MAJOR="$(echo ${CONTAINERD_VERSION} | awk -F '.' '{ print $1; }')"
 declare -r CONTAINERD_MINOR="$(echo ${CONTAINERD_VERSION} | awk -F '.' '{ print $2; }')"
 
@@ -43,10 +43,23 @@ install_helper() {
       make install)
 }
 
+# Figure out were btrfs headers are.
+#
+# Ubuntu 16.04 has only btrfs-tools, while 18.04 has a transitional package,
+# and later versions no longer have the transitional package.
+source /etc/os-release
+declare BTRFS_DEV
+if [[ "${VERSION_ID%.*}" -le "18" ]]; then
+  BTRFS_DEV="btrfs-tools"
+else
+  BTRFS_DEV="libbtrfs-dev"
+fi
+readonly BTRFS_DEV
+
 # Install dependencies for the crictl tests.
 while true; do
   if (apt-get update && apt-get install -y \
-      btrfs-tools \
+      "${BTRFS_DEV}" \
       libseccomp-dev); then
     break
   fi
@@ -62,14 +75,11 @@ install_helper github.com/containerd/containerd "v${CONTAINERD_VERSION}" "${GOPA
 install_helper github.com/kubernetes-sigs/cri-tools "v${CRITOOLS_VERSION}" "${GOPATH}"
 
 # Configure containerd-shim.
-#
-# Note that for versions <= 1.1 the legacy shim must be installed in /usr/bin,
-# which should align with the installer script in head.sh (or master.sh).
-if [[ "${CONTAINERD_MAJOR}" -le 1 ]] && [[ "${CONTAINERD_MINOR}" -lt 2 ]]; then
-  declare -r shim_config_path=/etc/containerd/gvisor-containerd-shim.toml
-  mkdir -p $(dirname ${shim_config_path})
-  cat > ${shim_config_path} <<-EOF
-    runc_shim = "/usr/bin/containerd-shim"
+declare -r shim_config_path=/etc/containerd/runsc/config.toml
+mkdir -p $(dirname ${shim_config_path})
+cat > ${shim_config_path} <<-EOF
+log_path = "/tmp/shim-logs/"
+log_level = "debug"
 
 [runsc_config]
     debug = "true"
@@ -77,7 +87,6 @@ if [[ "${CONTAINERD_MAJOR}" -le 1 ]] && [[ "${CONTAINERD_MINOR}" -lt 2 ]]; then
     strace = "true"
     file-access = "shared"
 EOF
-fi
 
 # Configure CNI.
 (cd "${GOPATH}" && src/github.com/containerd/containerd/script/setup/install-cni)
diff --git a/tools/installers/shim.sh b/tools/installers/shim.sh
index 8153ce283..9af50b5c7 100755
--- a/tools/installers/shim.sh
+++ b/tools/installers/shim.sh
@@ -30,4 +30,3 @@ if [[ -d "$0.runfiles" ]]; then
   runfiles="$0.runfiles"
 fi
 find -L "${runfiles}" -executable -type f -name containerd-shim-runsc-v1 -exec cp -L {} "${containerd_install_dir}" \;
-find -L "${runfiles}" -executable -type f -name gvisor-containerd-shim -exec cp -L {} "${containerd_install_dir}" \;