From 9a846bbdbfbccddcc743d81a7e805cc83c99e8c4 Mon Sep 17 00:00:00 2001
From: sickcodes <info@sick.codes>
Date: Thu, 25 Feb 2021 18:35:23 +0000
Subject: [PATCH] Chown the disk image early.

---
 Dockerfile.auto | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Dockerfile.auto b/Dockerfile.auto
index d24e295..7fa1bb8 100644
--- a/Dockerfile.auto
+++ b/Dockerfile.auto
@@ -127,22 +127,23 @@ RUN if [[ "${COMPLETE}" ]]; then \
 
 RUN mv ./Launch-nopicker.sh ./Launch.sh
 
-ENV DISPLAY=:99
-
-ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
-
 ENV BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2
 
+ENV DISPLAY=:99
+
 ENV ENV=/env
 
+ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
+
 ENV NOPICKER=true
 
 ENV TERMS_OF_USE=i_agree
 
 ENV BOILERPLATE="By using this Dockerfile, you hereby agree that you are a security reseacher or developer and agree to use this Dockerfile to make the world a safer place. Examples include: making your apps safer, finding your mobile phone, compiling security products, etc. You understand that Docker-OSX is an Open Source project, which is released to the public under the GNU Pulic License version 3 and above. You acknowledge that the Open Source project is absolutely unaffiliated with any third party, in any form whatsoever. Any trademarks or intelectual property which happen to be mentioned anywhere in or around the project are owned by their respective owners. By using this Dockerfile, you agree to agree to the EULA of each piece of upstream or downstream software. The following code is released for the sole purpose of security research, under the GNU Public License version 3. If you are concerned about the licensing, please note that this project is not AGPL. A copy of the license is available online: https://github.com/sickcodes/Docker-OSX/blob/master/LICENSE. In order to use the following Dockerfile you must read and understand the terms. Once you have read the terms, use the -e TERMS_OF_USE=i_agree or -e TERMS_OF_USE=i_disagree"
 
-CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null || true \
-    echo "${BOILERPLATE}" \
+CMD echo "Disk is being copied between layers... Please wait a minute..." \
+    && sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null || true \
+    && echo "${BOILERPLATE}" \
     && [[ "${TERMS_OF_USE}" = i_agree ]] || exit 1 \
     ; [[ "${NOPICKER}" == true ]] && mv ./Launch-nopicker.sh ./Launch.sh \
     ; [[ "${GENERATE_UNIQUE}" == true ]] \