From 6243c33e47039920dbcd11727aff2cb50096d9a8 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Sun, 28 Mar 2021 10:17:47 +0000 Subject: [PATCH] Remove envsubst to allow interactive QEMU using -i --- Dockerfile.auto | 2 +- Dockerfile.naked | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.auto b/Dockerfile.auto index 8175e3e..170029f 100644 --- a/Dockerfile.auto +++ b/Dockerfile.auto @@ -219,7 +219,7 @@ CMD echo "${BOILERPLATE}" \ /usr/bin/ssh-keygen -t rsa -f ~/.ssh/id_docker_osx -q -N "" \ && chmod 600 ~/.ssh/id_docker_osx \ ; } \ - ; envsubst < ./Launch.sh | bash \ + ; /bin/bash -c ./Launch.sh \ & echo "Booting Docker-OSX in the background. Please wait..." \ ; until [[ "$(sshpass -palpine ssh-copy-id -f -i ~/.ssh/id_docker_osx.pub -p 10022 user@127.0.0.1)" ]]; do \ echo "Disk is being copied between layers. Repeating until able to copy SSH key into OSX..." \ diff --git a/Dockerfile.naked b/Dockerfile.naked index 6a5e397..16de510 100644 --- a/Dockerfile.naked +++ b/Dockerfile.naked @@ -177,4 +177,4 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true --height "${HEIGHT:-1080}" \ --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \ ; } \ - ; ./enable-ssh.sh && envsubst < ./Launch.sh | bash + ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh