From 7382df8fa1fbc922827981a4cfd03c03b7888fb3 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Sat, 6 Mar 2021 19:18:23 +0000 Subject: Fix BOOTDISK expected logic --- Dockerfile.auto | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Dockerfile.auto') diff --git a/Dockerfile.auto b/Dockerfile.auto index 90bb432..3ea721d 100644 --- a/Dockerfile.auto +++ b/Dockerfile.auto @@ -129,7 +129,7 @@ RUN if [[ "${COMPLETE}" ]]; then \ && wget ${WGET_OPTIONS} -O /home/arch/OSX-KVM/mac_hdd_ng.img "${IMAGE_URL}" \ ; fi -ENV BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2 +ENV BOOTDISK ENV DISPLAY=:99 @@ -151,8 +151,9 @@ CMD echo "${BOILERPLATE}" \ ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \ ; [[ "${NOPICKER}" == true ]] && { \ sed -i '/^.*InstallMedia.*/d' Launch.sh \ - && export BOOTDISK="${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \ + && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \ ; } \ + || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \ ; [[ "${GENERATE_UNIQUE}" == true ]] && { \ ./Docker-OSX/custom/generate-unique-machine-values.sh \ --master-plist-url="${MASTER_PLIST_URL}" \ -- cgit v1.2.3 From c2916fd48748ff15dbb8cb79cc9b5655e4d509eb Mon Sep 17 00:00:00 2001 From: sickcodes Date: Sat, 6 Mar 2021 19:25:26 +0000 Subject: Dockerfile syntax error. --- Dockerfile.auto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile.auto') diff --git a/Dockerfile.auto b/Dockerfile.auto index 3ea721d..a9cb6a5 100644 --- a/Dockerfile.auto +++ b/Dockerfile.auto @@ -129,7 +129,7 @@ RUN if [[ "${COMPLETE}" ]]; then \ && wget ${WGET_OPTIONS} -O /home/arch/OSX-KVM/mac_hdd_ng.img "${IMAGE_URL}" \ ; fi -ENV BOOTDISK +ENV BOOTDISK= ENV DISPLAY=:99 -- cgit v1.2.3