From 8935ce08abc371911f2d6e2e24aff6b9bc64827a Mon Sep 17 00:00:00 2001
From: sickcodes <info@sick.codes>
Date: Sat, 6 Mar 2021 17:48:15 +0000
Subject: Fix bootdisk not getting written to persistent file when using
 NOPICKER=true. NOPICKER=true is overridden by a custom plist now anyway.

---
 Dockerfile.naked | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Dockerfile.naked')

diff --git a/Dockerfile.naked b/Dockerfile.naked
index 920a51f..28290a4 100644
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@@ -119,7 +119,7 @@ CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDIS
     ; } \
     ; [[ "${NOPICKER}" == true ]] && { \
         sed -i '/^.*InstallMedia.*/d' Launch.sh \
-        && export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2 \
+        && export BOOTDISK="${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \
     ; } \
     ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
         ./Docker-OSX/custom/generate-unique-machine-values.sh \
-- 
cgit v1.2.3


From 7d6e5b30d872a3e8fdc65099ed691dadabc46220 Mon Sep 17 00:00:00 2001
From: sickcodes <info@sick.codes>
Date: Sat, 6 Mar 2021 17:59:03 +0000
Subject: Remove useless case statements. Allow -e HEADLESS=true as human
 readable alternative to -e DISPLAY=:99.

---
 Dockerfile.naked | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'Dockerfile.naked')

diff --git a/Dockerfile.naked b/Dockerfile.naked
index 28290a4..f002781 100644
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@@ -106,6 +106,8 @@ ENV BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2
 
 ENV DISPLAY=:99
 
+ENV HEADLESS=false
+
 ENV ENV=/env
 
 ENV IMAGE_PATH=/image
@@ -113,7 +115,7 @@ ENV IMAGE_PATH=/image
 ENV NOPICKER=true
 
 CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
-    ; [[ "${DISPLAY}" = ':99' ]] && { \
+    ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
         nohup Xvfb :99 -screen 0 1920x1080x16 \
         & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \
     ; } \
@@ -145,10 +147,4 @@ CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDIS
             --height "${HEIGHT:-1080}" \
             --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
     ; } \
-    ; case "$(file --brief /bootdisk)" in \
-        QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \
-            ;; \
-        directory* ) export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2 \
-            ;; \
-    esac \
     ; ./enable-ssh.sh && envsubst < ./Launch.sh | bash
-- 
cgit v1.2.3