diff options
| author | sickcodes <[email protected]> | 2021-03-06 19:18:23 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-03-06 19:18:23 +0000 |
| commit | 7382df8fa1fbc922827981a4cfd03c03b7888fb3 (patch) | |
| tree | ea063a50e45c10d7a737172e8ba987b4a8ab05ea /Dockerfile.auto | |
| parent | Merge pull request #168 from sickcodes/generate-custom-edits (diff) | |
| download | docker-osx-7382df8fa1fbc922827981a4cfd03c03b7888fb3.tar.xz docker-osx-7382df8fa1fbc922827981a4cfd03c03b7888fb3.zip | |
Fix BOOTDISK expected logic
Diffstat (limited to 'Dockerfile.auto')
| -rw-r--r-- | Dockerfile.auto | 5 |
1 files changed, 3 insertions, 2 deletions
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}" \ |