From 4226ff70aae1c1f844b64ccfe1beb2283ee7cdb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kau=C3=AA=20Doretto=20Grecchi?= <kauedg@gmail.com>
Date: Wed, 30 Jan 2019 13:46:53 -0200
Subject: [PATCH 1/2] updated to fedora-29. issues #2889 $3058

---
 .../minikube/rootfs-overlay/usr/bin/toolbox    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/toolbox b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/toolbox
index 2bb4f0580400..ab4645668d4f 100644
--- a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/toolbox
+++ b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/toolbox
@@ -1,5 +1,4 @@
 #!/bin/bash
-# https://github.com/coreos/toolbox
 
 set -e
 set -o pipefail
@@ -8,12 +7,12 @@ machine=$(uname -m)
 
 case ${machine} in
 	aarch64 )
-		TOOLBOX_NAME=fedora-base-24-1.1.aarch64
-		TOOLBOX_DOCKER_ARCHIVE="https://dl.fedoraproject.org/pub/fedora-secondary/releases/24/Docker/aarch64/images/Fedora-Docker-Base-24-1.1.aarch64.tar.xz"
+		TOOLBOX_DOCKER_IMAGE=arm64v8/fedora
+		TOOLBOX_DOCKER_TAG=29
 		;;
 	x86_64 )
 		TOOLBOX_DOCKER_IMAGE=fedora
-		TOOLBOX_DOCKER_TAG=24
+		TOOLBOX_DOCKER_TAG=29
 		;;
 	* )
 		echo "Warning: Unknown machine type ${machine}" >&2
@@ -51,9 +50,9 @@ if [ ! -f "${osrelease}" ] || systemctl is-failed -q "${machinename}" ; then
 	sudo chown "${USER}:" "${machinepath}"
 
 	if [[ -n "${have_docker_image}" ]]; then
-		riid=$(sudo rkt --insecure-options=image fetch "docker://${TOOLBOX_DOCKER_IMAGE}:${TOOLBOX_DOCKER_TAG}")
-		sudo rkt image extract --overwrite --rootfs-only "${riid}" "${machinepath}"
-		sudo rkt image rm "${riid}"
+		riid=$(sudo --preserve-env rkt --insecure-options=image fetch "docker://${TOOLBOX_DOCKER_IMAGE}:${TOOLBOX_DOCKER_TAG}")
+		sudo --preserve-env rkt image extract --overwrite --rootfs-only "${riid}" "${machinepath}"
+		sudo --preserve-env rkt image rm "${riid}"
 	elif [[ -n "${TOOLBOX_DOCKER_ARCHIVE}" ]]; then
 		tmpdir=$(mktemp -d -p /var/tmp/)
 		trap "sudo rm -rf ${tmpdir}" EXIT PIPE
@@ -69,6 +68,11 @@ if [ ! -f "${osrelease}" ] || systemctl is-failed -q "${machinename}" ; then
 	sudo touch "${osrelease}"
 fi
 
+# Special case for when SSH tries to pass a shell command with -c
+if [ "x${1-}" == x-c ]; then
+	set /bin/sh "$@"
+fi
+
 sudo systemd-nspawn \
 	--directory="${machinepath}" \
 	--capability=all \

From d609aa323998a65e4754e1509447098ab4d773fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kau=C3=AA=20Doretto=20Grecchi?= <kauedg@gmail.com>
Date: Wed, 30 Jan 2019 14:37:17 -0200
Subject: [PATCH 2/2] $TOOLBOX_DOCKER_ARCHIVE variable removed

---
 .../board/coreos/minikube/rootfs-overlay/usr/bin/toolbox  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/toolbox b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/toolbox
index ab4645668d4f..3f38c70ec17a 100644
--- a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/toolbox
+++ b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/toolbox
@@ -53,14 +53,6 @@ if [ ! -f "${osrelease}" ] || systemctl is-failed -q "${machinename}" ; then
 		riid=$(sudo --preserve-env rkt --insecure-options=image fetch "docker://${TOOLBOX_DOCKER_IMAGE}:${TOOLBOX_DOCKER_TAG}")
 		sudo --preserve-env rkt image extract --overwrite --rootfs-only "${riid}" "${machinepath}"
 		sudo --preserve-env rkt image rm "${riid}"
-	elif [[ -n "${TOOLBOX_DOCKER_ARCHIVE}" ]]; then
-		tmpdir=$(mktemp -d -p /var/tmp/)
-		trap "sudo rm -rf ${tmpdir}" EXIT PIPE
-		wget -O- "${TOOLBOX_DOCKER_ARCHIVE}" | xz -cd | tar -C ${tmpdir} -xf -
-		layer=$(find ${tmpdir} -name layer.tar -type f)
-		sudo tar -C ${machinepath} -xf ${layer}
-		trap - EXIT PIPE
-		sudo rm -rf ${tmpdir}
 	else
 		echo "Error: No toolbox filesystem specified." >&2
 		exit 1