CREDIT: @TheHackerCoding Typo in README.md #194

4.2 Switch to using custom-plist at runtime. Allow -v -v plist:/plist plus -e MASTER_PLIST=/plist or -e MASTER_PLIST_URL=https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-nopicker-custom.plist
2025-07-02 18:53:31 -05:00 · 2021-03-15 19:28:02 +00:00 · 2021-03-15 19:23:18 +00:00
17 changed files with 640 additions and 2884 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,19 +1,8 @@
 |Version|Date|Notes|
 |---|---|---|
-|   |2021-09-18|Add `-e NETDEV=`|
-|   |2021-09-09|Add Monterey|
-|   |2021-08-27|Add iPhone passthrough OTA!|
-|6.0|2021-08-25|Added naked-auto. Keep kernel at 5.13, even tho it's just for supermin.|
-|5.0|2021-07-25|Retire glibc patch. Retire file command patch. Add bootmenu=on.|
-|   |2021-07-08|Add CPUID_FLAGS to edit the CPUID flags on the fly.|
-|4.4|2021-05-06|Prepare nakedvnc for hub.docker.com. Add `ENV BOOT_ARGS=` to supply additon boot arguments, for example, `vmx,rdtscp`. Add `ENV CPU=Penryn` to allow changes to the CPU emulation, for example, `Skylake-Client`, or see [more examples here](https://manpages.ubuntu.com/manpages/disco/man7/qemu-cpu-models.7.html).| 
-|   |2021-05-04|Disable arbitrary chown warning| 
-|   |2021-04-27|Fixed missing sudo| 
-|   |2021-04-18|Add LIBGUESTFS debug & trace commands, exit on fail when creating bootdisks. Silence touch errors.| 
-|4.3|2021-03-24|Enable interactive QEMU again. Remove envsubst since we are already using bash... Add set -x flag| 
-|4.2|2021-03-24|Add all ENV variables to each dockerfile for readability. Add RAM allocation buffer and cache drop bug fix. Add kvm and libvirt groups. Add `IMAGE_FORMAT=qcow2` to allow `IMAGE_FORMAT=raw` too.|
-|   |2021-03-19|Use RAM=3 as the default RAM allocation. Add instructions to clear buff/cache.|
-|   |2021-03-17|Add RAM=max and RAM=half to dynamically select ram at runtime (DEFAULT).|
+|4.2|2021-03-15|No longer use static qcow2 bootdisks. Create at runtime. Supply own with `-v plist:/plist` plus `-e MASTER_PLIST=/plist` or `-e MASTER_PLIST_URL=https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-nopicker-custom.plist`|
+|   |2021-03-14|Change default RAM to 2G|
+|   |2021-03-09|Add https://github.com/sickcodes/osx-serial-generator.git as a submodule to replace ./custom|
 |   |2021-03-06|Change envs to require --envs. Automatically enable --envs if --output-env is used. Same for plists, bootdisks. Fix help ugliness and sanity of generate serial scripts. Fix bootdisk not getting written to persistent file when using NOPICKER=true. NOPICKER=true is overridden by a custom plist now anyway. Remove useless case statements. Allow -e HEADLESS=true as human readable alternative to -e DISPLAY=:99.|
 |4.1|2021-03-04|Add `-e MASTER_PLIST_URL` to all images to allow using your own remote plist.|
 |   |2021-03-03|Add `WIDTH` and `HEIGHT` to set the x and y resolutions, use in conjuction with serial numbers.|
--- a/CREDITS.md
+++ b/CREDITS.md
@ -1,16 +1,8 @@
 # Credits

-## Upstream Acknowledgements:
+The upstream credits are available at [@Kholia](https://github.com/Kholia)'s repo https://github.com/kholia/OSX-KVM/blob/master/CREDITS.md

-This project uses OSX-KVM from https://github.com/kholia/OSX-KVM and fully appreciates the work done by [@Kholia](https://github.com/Kholia) and all the contributors who are listed: [https://github.com/kholia/OSX-KVM/blob/master/CREDITS.md](https://github.com/kholia/OSX-KVM/blob/master/CREDITS.md)
-
-This project also uses KVM-OpenCore from https://github.com/Leoyzen/KVM-Opencore and fully appreciates the work done by [@Leoyzen](https://github.com/Leoyzen).
-
-We use a special fork by [Nicholas Sherlock](https://www.nicksherlock.com/) of KVM-Opencore https://github.com/thenickdude/KVM-Opencore and thank Nick for his awesome upstream work!
-
-This project now uses the fantastic OpenCore bootloader from the community OpenCore project: https://github.com/acidanthera/OpenCorePkg. You can join their [Subreddit here](https://www.reddit.com/r/hackintosh/)!
-
-## These credits refer to the contributors to this repository:
+These credits refer to the contributors to this repository:

 [@GreeFine](https://github.com/GreeFine) - Readme Typo #9 

@ -46,7 +38,7 @@ This project now uses the fantastic OpenCore bootloader from the community OpenC

 [@PeterDaveHello](https://github.com/PeterDaveHello) - Reduce image size by setting git clone depth #110

-[@PeterDaveHello](https://github.com/PeterDaveHello) - Reduce Dockerfile instructions and Docker image layers #112
+[@PeterDaveHello](https://github.com/PeterDaveHello) -  Reduce Dockerfile instructions and Docker image layers #112

 [@weskerfoot](https://github.com/weskerfoot) Docs updates: usb passthrough, headless mode, disk space reduction guide #113

@ -67,29 +59,3 @@ This project now uses the fantastic OpenCore bootloader from the community OpenC
 [@edsonboldrini](https://github.com/edsonboldrini) - Update README.md #161

 [@TheHackerCoding](https://github.com/TheHackerCoding) - Typo in README.md #194 
-
-[@panos](https://github.com/panos) - Improved README #212 
-
-[@ggjulio](https://github.com/ggjulio) - Restarting an "auto" container #216
-
-[@panos](https://github.com/panos) - Made further improvements to the README #219
-
-[@a10kiloham](https://github.com/a10kiloham) - Dockerfile for :naked image with VNC support #245 
-
-[@a10kiloham](https://github.com/a10kiloham) - Adding Bluebubbles as an example use case #250 
-
-[@aronzvi](https://github.com/aronzvi) - Fixed Failed to boot OSX with GENERATE_UNIQUE #244
-
-[@tinjaw](https://github.com/tinjaw) - Fixed Type #258
-
-[@m-zheng](https://github.com/m-zheng) -  Update README.md #260 
-
-[@johnjhacking](https://github.com/johnjhacking) - Change call function to Popen #288 
-
-[@allansrc](https://github.com/allansrc) - Update Doc detail for run on WLS #318 
-
-[@mcandre](https://github.com/mcandre) - fix typo #334 
-
-[@cybik](https://github.com/cybik) Spice fix #337
-
-[@Silfalion](https://github.com/Silfalion) - [https://github.com/Silfalion/Iphone_docker_osx_passthrough](https://github.com/Silfalion/Iphone_docker_osx_passthrough)
--- a/142
+++ b/142
@ -7,7 +7,7 @@
 #
 # Title:            Docker-OSX (Mac on Docker)
 # Author:           Sick.Codes https://twitter.com/sickcodes
-# Version:          6.0
+# Version:          4.2
 # License:          GPLv3+
 # Repository:       https://github.com/sickcodes/Docker-OSX
 # Website:          https://sick.codes
@ -67,6 +67,12 @@ ARG RANKMIRRORS
 ARG MIRROR_COUNTRY=US
 ARG MIRROR_COUNT=10

+# TEMP-FIX for pacman issue
+RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
+    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
+    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
+# TEMP-FIX for pacman issue
+
 RUN if [[ "${RANKMIRRORS}" ]]; then \
        { pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
        ; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/rankmirrors" \
@ -93,6 +99,12 @@ RUN pacman -Syu git zip vim nano alsa-utils openssh --noconfirm \
    && mkdir /home/arch \
    && chown arch:arch /home/arch

+# TEMP-FIX for pacman issue
+RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
+    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
+    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
+# TEMP-FIX for pacman issue
+
 # allow ssh to container
 RUN mkdir -m 700 /root/.ssh

@ -114,7 +126,6 @@ RUN tee -a sshd_config <<< 'AllowTcpForwarding yes' \
 USER arch

 # download OSX-KVM
-# RUN git clone --recurse-submodules --depth 1 https://github.com/kholia/OSX-KVM.git /home/arch/OSX-KVM
 RUN git clone --recurse-submodules --depth 1 https://github.com/kholia/OSX-KVM.git /home/arch/OSX-KVM

 # enable ssh
@ -143,9 +154,16 @@ RUN touch enable-ssh.sh \
 RUN yes | sudo pacman -Syu qemu libvirt dnsmasq virt-manager bridge-utils openresolv jack ebtables edk2-ovmf netctl libvirt-dbus wget --overwrite --noconfirm \
    && yes | sudo pacman -Scc

-WORKDIR /home/arch/OSX-KVM
+# TEMP-FIX for pacman issue
+RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
+    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
+    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
+# TEMP-FIX for pacman issue

-RUN wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/fetch-macOS.py
+# RUN sudo systemctl enable libvirtd.service
+# RUN sudo systemctl enable virtlogd.service
+
+WORKDIR /home/arch/OSX-KVM

 RUN [[ "${VERSION%%.*}" -lt 11 ]] && { python fetch-macOS.py --version "${VERSION}" \
        && qemu-img convert BaseSystem.dmg -O qcow2 -p -c BaseSystem.img \
@ -165,6 +183,9 @@ RUN [[ "${VERSION%%.*}" -ge 11 ]] && { wget "${FETCH_MAC_OS_RAW}" \
        && rm -f BaseSystem.dmg \
    ; } || true

+# > Launch.sh
+# > Docker-OSX.xml
+
 WORKDIR /home/arch/OSX-KVM

 ARG LINUX=true
@ -172,30 +193,33 @@ ARG LINUX=true
 # required to use libguestfs inside a docker container, to create bootdisks for docker-osx on-the-fly
 RUN if [[ "${LINUX}" == true ]]; then \
        sudo pacman -Syu linux libguestfs --noconfirm \
+        && patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
+        && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
+        && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine." \
    ; fi

 # optional --build-arg to change branches for testing
 ARG BRANCH=master
 ARG REPO='https://github.com/sickcodes/Docker-OSX.git'
-# RUN git clone --recurse-submodules --depth 1 --branch "${BRANCH}" "${REPO}"
 RUN git clone --recurse-submodules --depth 1 --branch "${BRANCH}" "${REPO}"

+# env -e ADDITIONAL_PORTS with a comma
+# for example, -e ADDITIONAL_PORTS=hostfwd=tcp::23-:23,
+ENV ADDITIONAL_PORTS=
+
 RUN touch Launch.sh \
    && chmod +x ./Launch.sh \
-    && tee -a Launch.sh <<< '#!/bin/bash' \
-    && tee -a Launch.sh <<< 'set -eux' \
+    && tee -a Launch.sh <<< '#!/bin/sh' \
+    && tee -a Launch.sh <<< 'set -eu' \
    && tee -a Launch.sh <<< 'sudo chown    $(id -u):$(id -g) /dev/kvm 2>/dev/null || true' \
    && tee -a Launch.sh <<< 'sudo chown -R $(id -u):$(id -g) /dev/snd 2>/dev/null || true' \
-    && tee -a Launch.sh <<< '[[ "${RAM}" = max ]] && export RAM="$(("$(head -n1 /proc/meminfo | tr -dc "[:digit:]") / 1000000"))"' \
-    && tee -a Launch.sh <<< '[[ "${RAM}" = half ]] && export RAM="$(("$(head -n1 /proc/meminfo | tr -dc "[:digit:]") / 2000000"))"' \
-    && tee -a Launch.sh <<< 'sudo chown -R $(id -u):$(id -g) /dev/snd 2>/dev/null || true' \
    && tee -a Launch.sh <<< 'exec qemu-system-x86_64 -m ${RAM:-2}000 \' \
-    && tee -a Launch.sh <<< '-cpu ${CPU:-Penryn},${CPUID_FLAGS:-vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,}${BOOT_ARGS} \' \
-    && tee -a Launch.sh <<< '-machine q35,${KVM-"accel=kvm:tcg"} \' \
+    && tee -a Launch.sh <<< '-cpu Penryn,vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+pcid,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check \' \
+    && tee -a Launch.sh <<< '-machine q35,accel=kvm:tcg \' \
    && tee -a Launch.sh <<< '-smp ${CPU_STRING:-${SMP:-4},cores=${CORES:-4}} \' \
    && tee -a Launch.sh <<< '-usb -device usb-kbd -device usb-tablet \' \
    && tee -a Launch.sh <<< '-device isa-applesmc,osk=ourhardworkbythesewordsguardedpleasedontsteal\(c\)AppleComputerInc \' \
-    && tee -a Launch.sh <<< '-drive if=pflash,format=raw,readonly=on,file=/home/arch/OSX-KVM/OVMF_CODE.fd \' \
+    && tee -a Launch.sh <<< '-drive if=pflash,format=raw,readonly,file=/home/arch/OSX-KVM/OVMF_CODE.fd \' \
    && tee -a Launch.sh <<< '-drive if=pflash,format=raw,file=/home/arch/OSX-KVM/OVMF_VARS-1024x768.fd \' \
    && tee -a Launch.sh <<< '-smbios type=2 \' \
    && tee -a Launch.sh <<< '-audiodev ${AUDIO_DRIVER:-alsa},id=hda -device ich9-intel-hda -device hda-duplex,audiodev=hda \' \
@ -204,12 +228,11 @@ RUN touch Launch.sh \
    && tee -a Launch.sh <<< '-device ide-hd,bus=sata.2,drive=OpenCoreBoot \' \
    && tee -a Launch.sh <<< '-device ide-hd,bus=sata.3,drive=InstallMedia \' \
    && tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=/home/arch/OSX-KVM/BaseSystem.img,format=qcow2 \' \
-    && tee -a Launch.sh <<< '-drive id=MacHDD,if=none,file=${IMAGE_PATH:-/home/arch/OSX-KVM/mac_hdd_ng.img},format=${IMAGE_FORMAT:-qcow2} \' \
+    && tee -a Launch.sh <<< '-drive id=MacHDD,if=none,file=${IMAGE_PATH:-/home/arch/OSX-KVM/mac_hdd_ng.img},format=qcow2 \' \
    && tee -a Launch.sh <<< '-device ide-hd,bus=sata.4,drive=MacHDD \' \
-    && tee -a Launch.sh <<< '-netdev ${NETDEV:-user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900,${ADDITIONAL_PORTS}} \' \
-    && tee -a Launch.sh <<< '-device ${NETWORKING_DEVICE:-vmxnet3},netdev=net0,id=net0,mac=${MAC_ADDRESS:-52:54:00:09:49:17} \' \
+    && tee -a Launch.sh <<< '-netdev user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900,${ADDITIONAL_PORTS} \' \
+    && tee -a Launch.sh <<< '-device ${NETWORKING:-vmxnet3},netdev=net0,id=net0,mac=${MAC_ADDRESS:-52:54:00:09:49:17} \' \
    && tee -a Launch.sh <<< '-monitor stdio \' \
-    && tee -a Launch.sh <<< '-boot menu=on \' \
    && tee -a Launch.sh <<< '-vga vmware \' \
    && tee -a Launch.sh <<< '${EXTRA:-}'

@ -224,78 +247,33 @@ USER arch

 ENV USER arch

-# 5.13 problem
-ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
-
-ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
-
-ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
-
-RUN sudo pacman -Rns linux --noconfirm \
-    ; sudo pacman -Syy \
-    ; sudo pacman -S mkinitcpio --noconfirm \
-    ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
-    ; sudo rm -rf /var/tmp/.guestfs-* \
-    ; libguestfs-test-tool
-
-#### SPECIAL RUNTIME ARGUMENTS BELOW
-
-# env -e ADDITIONAL_PORTS with a comma
-# for example, -e ADDITIONAL_PORTS=hostfwd=tcp::23-:23,
-ENV ADDITIONAL_PORTS=
-
-# add additional QEMU boot arguments
-ENV BOOT_ARGS=
-
 ENV BOOTDISK=

-# edit the CPU that is being emulated
-ENV CPU=Penryn
-ENV CPUID_FLAGS='vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,'
-
 ENV DISPLAY=:0.0

-# Deprecated
 ENV ENV=/env

+ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
+
+# ENV NETWORKING=e1000-82545em
+ENV NETWORKING=vmxnet3
+
 # Boolean for generating a bootdisk with new random serials.
 ENV GENERATE_UNIQUE=false

 # Boolean for generating a bootdisk with specific serials.
 ENV GENERATE_SPECIFIC=false

-ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
-ENV IMAGE_FORMAT=qcow2
-
-ENV KVM='accel=kvm:tcg'
-
-ENV MASTER_PLIST_URL="https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-nopicker-custom.plist"
-
-# Add NETDEV for bridged networking option, see https://github.com/sickcodes/Docker-OSX/issues/72
-# ENV NETDEV='tap,id=net0,ifname=tap0,script=no,downscript=no'
-# ENV NETDEV='user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900,${ADDITIONAL_PORTS}'
-
-# ENV NETWORKING=e1000-82545em
-# renamed to NETWORKING_DEVICE, but not deprecated
-ENV NETWORKING=vmxnet3
-ENV NETWORKING_DEVICE="${NETWORKING}"
-
 # boolean for skipping the disk selection menu at in the boot process
 ENV NOPICKER=false

-# dynamic RAM options for runtime
-ENV RAM=3
-# ENV RAM=max
-# ENV RAM=half
-
 # The x and y coordinates for resolution.
 # Must be used with either -e GENERATE_UNIQUE=true or -e GENERATE_SPECIFIC=true.
 ENV WIDTH=1920
 ENV HEIGHT=1080

-# libguestfs verbose
-ENV LIBGUESTFS_DEBUG=1
-ENV LIBGUESTFS_TRACE=1
+ENV MASTER_PLIST_URL=
+ENV MASTER_PLIST=./Docker-OSX/osx-serial-generator/config-custom.plist

 VOLUME ["/tmp/.X11-unix"]

@ -311,23 +289,31 @@ VOLUME ["/tmp/.X11-unix"]
    # -e UUID="5CCB366D-9118-4C61-A00A-E5BAF3BED451" \
    # -e MAC_ADDRESS="A8:5C:2C:9A:46:2F" \

+### DEPRECATED:
 # the output will be /bootdisk.
 # /bootdisk is a useful persistent place to store the 15Mb serial number bootdisk.
+### WHY? Pointless as bootdisk will be made at runtime.

 # if you don't set any of the above:
 # the default serial numbers are already contained in ./OpenCore-Catalina/OpenCore.qcow2
 # And the default serial numbers

-CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
-    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
+# First, the container touches files. This will cause the host to give the file to that container
+# Second, the container chowns all those files, so that it can use them
+# If NOPICKER is true, the config-nopicker-custom.plist is used
+## If you set a URL instead, it will download that over whatever you set for the MASTER_PLIST
+
+CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
+    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
    ; [[ "${NOPICKER}" == true ]] && { \
        sed -i '/^.*InstallMedia.*/d' Launch.sh \
-        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \
+        && export MASTER_PLIST="${MASTER_PLIST:-./Docker-OSX/osx-serial-generator/config-nopicker-custom.plist}" \
    ; } \
-    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+    || export MASTER_PLIST="${MASTER_PLIST:-./Docker-OSX/osx-serial-generator/config-custom.plist}" \
+    ; [[ "${MASTER_PLIST_URL}" ]] && wget -O "${MASTER_PLIST}" "${MASTER_PLIST_URL}" \
    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
-            --master-plist-url="${MASTER_PLIST_URL}" \
+            --master-plist="${MASTER_PLIST}" \
            --count 1 \
            --tsv ./serial.tsv \
            --bootdisks \
@ -335,11 +321,11 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
            --height "${HEIGHT:-1080}" \
            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
            --output-env "${ENV:=/env}" \
-    || exit 1 ; } \
+    ; } \
    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
            source "${ENV:=/env}" 2>/dev/null \
            ; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
-            --master-plist-url="${MASTER_PLIST_URL}" \
+            --master-plist="${MASTER_PLIST}" \
            --model "${DEVICE_MODEL}" \
            --serial "${SERIAL}" \
            --board-serial "${BOARD_SERIAL}" \
@ -348,8 +334,8 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-    || exit 1 ; } \
-    ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh
+    ; } \
+    ; ./enable-ssh.sh && envsubst < ./Launch.sh | bash

 # virt-manager mode: eta son
 # CMD virsh define <(envsubst < Docker-OSX.xml) && virt-manager || virt-manager
--- a/Dockerfile.auto
+++ b/Dockerfile.auto
@ -7,7 +7,7 @@
 # 
 # Title:            Docker-OSX (Mac on Docker)
 # Author:           Sick.Codes https://twitter.com/sickcodes
-# Version:          6.0
+# Version:          4.2
 # License:          GPLv3+
 # Repository:       https://github.com/sickcodes/Docker-OSX
 # Website:          https://sick.codes
@ -56,7 +56,6 @@ ARG SCROT
 ARG RANKMIRRORS
 ARG MIRROR_COUNTRY=US
 ARG MIRROR_COUNT=10
-
 RUN if [[ "${RANKMIRRORS}" ]]; then \
        { pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
        ; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/rankmirrors" \
@ -71,6 +70,12 @@ RUN if [[ "${RANKMIRRORS}" ]]; then \
    ; fi \
    ; yes | pacman -Scc

+# TEMP-FIX for pacman issue
+RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
+    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
+    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
+# TEMP-FIX for pacman issue
+
 RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noconfirm \
    && if [[ "${SCROT}" ]]; then \
        pacman -Syu scrot base-devel --noconfirm \
@ -88,24 +93,14 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
    ; fi \
    ; yes | pacman -Scc

+# TEMP-FIX for pacman issue
+RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
+    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
+    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
+# TEMP-FIX for pacman issue
+
 USER arch

-ENV USER arch
-
-# 5.13 problem
-ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
-
-ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
-
-ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
-
-RUN sudo pacman -Rns linux --noconfirm \
-    ; sudo pacman -Syy \
-    ; sudo pacman -S mkinitcpio --noconfirm \
-    ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
-    ; sudo rm -rf /var/tmp/.guestfs-* \
-    ; libguestfs-test-tool
-
 WORKDIR /home/arch/OSX-KVM

 RUN mkdir -p ~/.ssh \
@ -120,104 +115,70 @@ RUN mkdir -p ~/.ssh \

 ARG COMPLETE=true

+# Feel free to take a copy of this image and then host it internally
+ARG IMAGE_URL='https://images2.sick.codes/mac_hdd_ng_auto.img'
+
 # use the COMPLETE arg, for a complete image, ready to boot.
 # otherwise use your own image: -v "$PWD/disk.img":/image
 ARG WGET_OPTIONS=
 # ARG WGET_OPTIONS='--no-verbose'

-# Feel free to take a copy of this image and then host it internally
-ARG IMAGE_URL='https://images.sick.codes/mac_hdd_ng_auto.img'
-# ARG IMAGE_URL='https://images.sick.codes/mac_hdd_ng_auto_big_sur.img'
-
 RUN if [[ "${COMPLETE}" ]]; then \
-        echo "Downloading 20GB image... This step might take a while... Press Ctrl+C if you want to abort." \
+        echo "Downloading 20GB+ image... This step might take a while... Press Ctrl+C if you want to abort." \
        ; rm -f /home/arch/OSX-KVM/mac_hdd_ng.img \
        && wget ${WGET_OPTIONS} -O /home/arch/OSX-KVM/mac_hdd_ng.img "${IMAGE_URL}" \
    ; fi

-#### SPECIAL RUNTIME ARGUMENTS BELOW
-
-ENV ADDITIONAL_PORTS=
-
-# add additional QEMU boot arguments
-ENV BOOT_ARGS=
-
 ENV BOOTDISK=

-# edit the CPU that is beign emulated
-ENV CPU=Penryn
-
 ENV DISPLAY=:99

 ENV HEADLESS=false

 ENV ENV=/env

-# Boolean for generating a bootdisk with new random serials.
-ENV GENERATE_UNIQUE=false
-
-# Boolean for generating a bootdisk with specific serials.
-ENV GENERATE_SPECIFIC=false
-
 ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
-ENV IMAGE_FORMAT=qcow2
-
-ENV KVM='accel=kvm:tcg'
-
-# ENV MASTER_PLIST_URL="https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-custom.plist"
-
-# ENV NETWORKING=e1000-82545em
-ENV NETWORKING=vmxnet3

 ENV NOPICKER=true

-# set the username and password for automatically logging in
-ENV USERNAME=user
-ENV PASSWORD=alpine
-
-# dynamic RAM options for runtime
-ENV RAM=3
-# ENV RAM=max
-# ENV RAM=half
-
 # The x and y coordinates for resolution.
 # Must be used with either -e GENERATE_UNIQUE=true or -e GENERATE_SPECIFIC=true.
 ENV WIDTH=1920
 ENV HEIGHT=1080

-# libguestfs verbose
-ENV LIBGUESTFS_DEBUG=1
-ENV LIBGUESTFS_TRACE=1
+ENV MASTER_PLIST_URL=
+ENV MASTER_PLIST=./Docker-OSX/osx-serial-generator/config-nopicker-custom.plist

 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"
+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."

 CMD echo "${BOILERPLATE}" \
    ; [[ "${TERMS_OF_USE}" = i_agree ]] || exit 1 \
    ; echo "Disk is being copied between layers... Please wait a minute..." \
-    ; sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
-    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
+    ; sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
+    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
    ; [[ "${NOPICKER}" == true ]] && { \
        sed -i '/^.*InstallMedia.*/d' Launch.sh \
-        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \
+        && export MASTER_PLIST="${MASTER_PLIST:-./Docker-OSX/osx-serial-generator/config-nopicker-custom.plist}" \
    ; } \
-    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+    || export MASTER_PLIST="${MASTER_PLIST:-./Docker-OSX/osx-serial-generator/config-custom.plist}" \
+    ; [[ "${MASTER_PLIST_URL}" ]] && wget -O "${MASTER_PLIST}" "${MASTER_PLIST_URL}" \
    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
-            --master-plist-url="${MASTER_PLIST_URL}" \
+            --master-plist="${MASTER_PLIST}" \
            --count 1 \
            --tsv ./serial.tsv \
            --bootdisks \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+            --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
            --output-env "${ENV:=/env}" \
-    || exit 1 ; } \
+    ; } \
    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
            source "${ENV:=/env}" 2>/dev/null \
            ; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
-            --master-plist-url="${MASTER_PLIST_URL}" \
+            --master-plist="${MASTER_PLIST}" \
            --model "${DEVICE_MODEL}" \
            --serial "${SERIAL}" \
            --board-serial "${BOARD_SERIAL}" \
@ -225,8 +186,8 @@ CMD echo "${BOILERPLATE}" \
            --mac-address "${MAC_ADDRESS}" \
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}"  \
-    || exit 1 ; } \
+            --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}"  \
+    ; } \
    ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
        nohup Xvfb :99 -screen 0 1920x1080x16 \
        & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \
@ -238,15 +199,15 @@ CMD echo "${BOILERPLATE}" \
        /usr/bin/ssh-keygen -t rsa -f ~/.ssh/id_docker_osx -q -N "" \
        && chmod 600 ~/.ssh/id_docker_osx \
    ; } \
-    ; /bin/bash -c ./Launch.sh \
+    ; envsubst < ./Launch.sh | bash \
    & echo "Booting Docker-OSX in the background. Please wait..." \
-    ; until [[ "$(sshpass -p${PASSWORD:=alpine} ssh-copy-id -f -i ~/.ssh/id_docker_osx.pub -p 10022 ${USERNAME:=user}@127.0.0.1)" ]]; do \
+    ; 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..." \
        ; sleep 1 \
    ; done \
    ; grep id_docker_osx ~/.ssh/config || { \
        tee -a ~/.ssh/config <<< 'Host 127.0.0.1' \
-        ; tee -a ~/.ssh/config <<< "    User ${USERNAME:=user}" \
+        ; tee -a ~/.ssh/config <<< '    User user' \
        ; tee -a ~/.ssh/config <<< '    Port 10022' \
        ; tee -a ~/.ssh/config <<< '    IdentityFile ~/.ssh/id_docker_osx' \
        ; tee -a ~/.ssh/config <<< '    StrictHostKeyChecking no' \
@ -255,7 +216,7 @@ CMD echo "${BOILERPLATE}" \
    && echo 'Default username: user' \
    && echo 'Default password: alpine' \
    && echo 'Change it immediately using the command: passwd' \
-    && ssh -i ~/.ssh/id_docker_osx ${USERNAME:=user}@127.0.0.1 -p 10022 "${OSX_COMMANDS}"
+    && ssh -i ~/.ssh/id_docker_osx user@127.0.0.1 -p 10022 "${OSX_COMMANDS}"

 # username: user
 # password: alpine
--- a/Dockerfile.monterey
+++ b/Dockerfile.monterey
@ -1,223 +0,0 @@
-#!/usr/bin/docker
-#     ____             __             ____  ______  __
-#    / __ \____  _____/ /_____  _____/ __ \/ ___/ |/ /
-#   / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \|   /
-#  / /_/ / /_/ / /__/ ,< /  __/ /  / /_/ /___/ /   |
-# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_| [MONTEREY]
-#
-# Title:            Docker-OSX (Mac on Docker)
-# Author:           Sick.Codes https://twitter.com/sickcodes
-# Version:          6.0
-# License:          GPLv3+
-# Repository:       https://github.com/sickcodes/Docker-OSX
-# Website:          https://sick.codes
-# 
-# Notes:            Uses a self-hosted BaseSystem.img from a USB installer.
-#                   If you want to DIY, use https://github.com/corpnewt/gibMacOS
-#                   Set seed as developer, and install the Install Assistant on Big Sur
-#                   Burn to a USB, and pull out BaseSystem.img
-#                   Or download from https://images.sick.codes/BaseSystem_Monterey.dmg
-# 
-
-FROM sickcodes/docker-osx
-
-MAINTAINER 'https://twitter.com/sickcodes' <https://sick.codes>
-
-SHELL ["/bin/bash", "-c"]
-
-# change disk size here or add during build, e.g. --build-arg VERSION=10.14.5 --build-arg SIZE=50G
-ARG SIZE=200G
-ARG BASE_SYSTEM='https://images.sick.codes/BaseSystem_Monterey.dmg'
-
-WORKDIR /home/arch/OSX-KVM
-
-RUN wget -O BaseSystem.dmg "${BASE_SYSTEM}" \
-    && qemu-img convert BaseSystem.dmg -O qcow2 -p -c BaseSystem.img \
-    && rm -f BaseSystem.dmg
-
-RUN qemu-img create -f qcow2 /home/arch/OSX-KVM/mac_hdd_ng.img "${SIZE}"
-
-WORKDIR /home/arch/OSX-KVM
-
-ARG LINUX=true
-
-# required to use libguestfs inside a docker container, to create bootdisks for docker-osx on-the-fly
-RUN if [[ "${LINUX}" == true ]]; then \
-        sudo pacman -Syu linux libguestfs --noconfirm \
-    ; fi
-
-# optional --build-arg to change branches for testing
-ARG BRANCH=master
-ARG REPO='https://github.com/sickcodes/Docker-OSX.git'
-# RUN git clone --recurse-submodules --depth 1 --branch "${BRANCH}" "${REPO}"
-RUN rm -rf ./Docker-OSX \
-    && git clone --recurse-submodules --depth 1 --branch "${BRANCH}" "${REPO}"
-
-RUN touch Launch.sh \
-    && chmod +x ./Launch.sh \
-    && tee -a Launch.sh <<< '#!/bin/bash' \
-    && tee -a Launch.sh <<< 'set -eux' \
-    && tee -a Launch.sh <<< 'sudo chown    $(id -u):$(id -g) /dev/kvm 2>/dev/null || true' \
-    && tee -a Launch.sh <<< 'sudo chown -R $(id -u):$(id -g) /dev/snd 2>/dev/null || true' \
-    && tee -a Launch.sh <<< '[[ "${RAM}" = max ]] && export RAM="$(("$(head -n1 /proc/meminfo | tr -dc "[:digit:]") / 1000000"))"' \
-    && tee -a Launch.sh <<< '[[ "${RAM}" = half ]] && export RAM="$(("$(head -n1 /proc/meminfo | tr -dc "[:digit:]") / 2000000"))"' \
-    && tee -a Launch.sh <<< 'sudo chown -R $(id -u):$(id -g) /dev/snd 2>/dev/null || true' \
-    && tee -a Launch.sh <<< 'exec qemu-system-x86_64 -m ${RAM:-2}000 \' \
-    && tee -a Launch.sh <<< '-cpu ${CPU:-Penryn},${CPUID_FLAGS:-vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,}${BOOT_ARGS} \' \
-    && tee -a Launch.sh <<< '-machine q35,${KVM-"accel=kvm:tcg"} \' \
-    && tee -a Launch.sh <<< '-smp ${CPU_STRING:-${SMP:-4},cores=${CORES:-4}} \' \
-    && tee -a Launch.sh <<< '-usb -device usb-kbd -device usb-tablet \' \
-    && tee -a Launch.sh <<< '-device isa-applesmc,osk=ourhardworkbythesewordsguardedpleasedontsteal\(c\)AppleComputerInc \' \
-    && tee -a Launch.sh <<< '-drive if=pflash,format=raw,readonly=on,file=/home/arch/OSX-KVM/OVMF_CODE.fd \' \
-    && tee -a Launch.sh <<< '-drive if=pflash,format=raw,file=/home/arch/OSX-KVM/OVMF_VARS-1024x768.fd \' \
-    && tee -a Launch.sh <<< '-smbios type=2 \' \
-    && tee -a Launch.sh <<< '-audiodev ${AUDIO_DRIVER:-alsa},id=hda -device ich9-intel-hda -device hda-duplex,audiodev=hda \' \
-    && tee -a Launch.sh <<< '-device ich9-ahci,id=sata \' \
-    && tee -a Launch.sh <<< '-drive id=OpenCoreBoot,if=none,snapshot=on,format=qcow2,file=${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2} \' \
-    && tee -a Launch.sh <<< '-device ide-hd,bus=sata.2,drive=OpenCoreBoot \' \
-    && tee -a Launch.sh <<< '-device ide-hd,bus=sata.3,drive=InstallMedia \' \
-    && tee -a Launch.sh <<< '-drive id=InstallMedia,if=none,file=/home/arch/OSX-KVM/BaseSystem.img,format=qcow2 \' \
-    && tee -a Launch.sh <<< '-drive id=MacHDD,if=none,file=${IMAGE_PATH:-/home/arch/OSX-KVM/mac_hdd_ng.img},format=${IMAGE_FORMAT:-qcow2} \' \
-    && tee -a Launch.sh <<< '-device ide-hd,bus=sata.4,drive=MacHDD \' \
-    && tee -a Launch.sh <<< '-netdev user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900,${ADDITIONAL_PORTS} \' \
-    && tee -a Launch.sh <<< '-device ${NETWORKING:-vmxnet3},netdev=net0,id=net0,mac=${MAC_ADDRESS:-52:54:00:09:49:17} \' \
-    && tee -a Launch.sh <<< '-monitor stdio \' \
-    && tee -a Launch.sh <<< '-boot menu=on \' \
-    && tee -a Launch.sh <<< '-vga vmware \' \
-    && tee -a Launch.sh <<< '${EXTRA:-}'
-
-# docker exec containerid mv ./Launch-nopicker.sh ./Launch.sh
-# This is now a legacy command.
-# You can use -e BOOTDISK=/bootdisk with -v ./bootdisk.img:/bootdisk
-RUN grep -v InstallMedia ./Launch.sh > ./Launch-nopicker.sh \
-    && chmod +x ./Launch-nopicker.sh \
-    && sed -i -e s/OpenCore\.qcow2/OpenCore\-nopicker\.qcow2/ ./Launch-nopicker.sh
-
-USER arch
-
-ENV USER arch
-
-# 5.13 problem
-ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
-
-ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
-
-ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
-
-RUN sudo pacman -Rns linux --noconfirm \
-    ; sudo pacman -Syy \
-    ; sudo pacman -S mkinitcpio --noconfirm \
-    ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
-    ; sudo rm -rf /var/tmp/.guestfs-* \
-    ; libguestfs-test-tool
-
-#### SPECIAL RUNTIME ARGUMENTS BELOW
-
-# env -e ADDITIONAL_PORTS with a comma
-# for example, -e ADDITIONAL_PORTS=hostfwd=tcp::23-:23,
-ENV ADDITIONAL_PORTS=
-
-# add additional QEMU boot arguments
-ENV BOOT_ARGS=
-
-ENV BOOTDISK=
-
-# edit the CPU that is being emulated
-ENV CPU=Penryn
-ENV CPUID_FLAGS='vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,'
-
-ENV DISPLAY=:0.0
-
-# Deprecated
-ENV ENV=/env
-
-# Boolean for generating a bootdisk with new random serials.
-ENV GENERATE_UNIQUE=false
-
-# Boolean for generating a bootdisk with specific serials.
-ENV GENERATE_SPECIFIC=false
-
-ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
-ENV IMAGE_FORMAT=qcow2
-
-ENV KVM='accel=kvm:tcg'
-
-ENV MASTER_PLIST_URL="https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-custom.plist"
-
-# ENV NETWORKING=e1000-82545em
-ENV NETWORKING=vmxnet3
-
-# boolean for skipping the disk selection menu at in the boot process
-ENV NOPICKER=false
-
-# dynamic RAM options for runtime
-ENV RAM=3
-# ENV RAM=max
-# ENV RAM=half
-
-# The x and y coordinates for resolution.
-# Must be used with either -e GENERATE_UNIQUE=true or -e GENERATE_SPECIFIC=true.
-ENV WIDTH=1920
-ENV HEIGHT=1080
-
-# libguestfs verbose
-ENV LIBGUESTFS_DEBUG=1
-ENV LIBGUESTFS_TRACE=1
-
-VOLUME ["/tmp/.X11-unix"]
-
-# check if /image is a disk image or a directory. This allows you to optionally use -v disk.img:/image
-# NOPICKER is used to skip the disk selection screen
-# GENERATE_UNIQUE is used to generate serial numbers on boot.
-# /env is a file that you can generate and save using -v source.sh:/env
-# the env file is a file that you can carry to the next container which will supply the serials numbers.
-# GENERATE_SPECIFIC is used to either accept the env serial numbers OR you can supply using:
-    # -e DEVICE_MODEL="iMacPro1,1" \
-    # -e SERIAL="C02TW0WAHX87" \
-    # -e BOARD_SERIAL="C027251024NJG36UE" \
-    # -e UUID="5CCB366D-9118-4C61-A00A-E5BAF3BED451" \
-    # -e MAC_ADDRESS="A8:5C:2C:9A:46:2F" \
-
-# the output will be /bootdisk.
-# /bootdisk is a useful persistent place to store the 15Mb serial number bootdisk.
-
-# if you don't set any of the above:
-# the default serial numbers are already contained in ./OpenCore-Catalina/OpenCore.qcow2
-# And the default serial numbers
-
-CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
-    ; 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.qcow2}" \
-    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
-        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
-            --master-plist-url="${MASTER_PLIST_URL}" \
-            --count 1 \
-            --tsv ./serial.tsv \
-            --bootdisks \
-            --width "${WIDTH:-1920}" \
-            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-            --output-env "${ENV:=/env}" \
-    || exit 1 ; } \
-    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
-            source "${ENV:=/env}" 2>/dev/null \
-            ; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
-            --master-plist-url="${MASTER_PLIST_URL}" \
-            --model "${DEVICE_MODEL}" \
-            --serial "${SERIAL}" \
-            --board-serial "${BOARD_SERIAL}" \
-            --uuid "${UUID}" \
-            --mac-address "${MAC_ADDRESS}" \
-            --width "${WIDTH:-1920}" \
-            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-    || exit 1 ; } \
-    ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh
-
-# virt-manager mode: eta son
-# CMD virsh define <(envsubst < Docker-OSX.xml) && virt-manager || virt-manager
-# CMD virsh define <(envsubst < macOS-libvirt-Catalina.xml) && virt-manager || virt-manager
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@ -7,7 +7,7 @@
 # 
 # Title:            Docker-OSX (Mac on Docker)
 # Author:           Sick.Codes https://twitter.com/sickcodes
-# Version:          6.0
+# Version:          4.2
 # License:          GPLv3+
 # Repository:       https://github.com/sickcodes/Docker-OSX
 # Website:          https://sick.codes
@ -46,16 +46,21 @@ ARG RANKMIRRORS
 ARG MIRROR_COUNTRY=US
 ARG MIRROR_COUNT=10
 RUN if [[ "${RANKMIRRORS}" ]]; then { pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
-        ; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/rankmirrors" \
-        ; wget -O- "https://www.archlinux.org/mirrorlist/?country=${MIRROR_COUNTRY:-US}&protocol=https&use_mirror_status=on" \
-        | sed -e 's/^#Server/Server/' -e '/^#/d' \
-        | head -n "$((${MIRROR_COUNT:-10}+1))" \
-        | bash ./rankmirrors --verbose --max-time 5 - > /etc/pacman.d/mirrorlist \
-        && tee -a /etc/pacman.d/mirrorlist <<< 'Server = http://mirrors.evowise.com/archlinux/$repo/os/$arch' \
-        && tee -a /etc/pacman.d/mirrorlist <<< 'Server = http://mirror.rackspace.com/archlinux/$repo/os/$arch' \
-        && tee -a /etc/pacman.d/mirrorlist <<< 'Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch' \
-        && cat /etc/pacman.d/mirrorlist \
-    ; fi
+    ; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/rankmirrors" \
+    ; wget -O- "https://www.archlinux.org/mirrorlist/?country=${MIRROR_COUNTRY:-US}&protocol=https&use_mirror_status=on" \
+    | sed -e 's/^#Server/Server/' -e '/^#/d' \
+    | head -n "$((${MIRROR_COUNT:-10}+1))" \
+    | bash ./rankmirrors --verbose --max-time 5 - > /etc/pacman.d/mirrorlist \
+    && tee -a /etc/pacman.d/mirrorlist <<< 'Server = http://mirrors.evowise.com/archlinux/$repo/os/$arch' \
+    && tee -a /etc/pacman.d/mirrorlist <<< 'Server = http://mirror.rackspace.com/archlinux/$repo/os/$arch' \
+    && tee -a /etc/pacman.d/mirrorlist <<< 'Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch' \
+    && cat /etc/pacman.d/mirrorlist ; fi
+
+# TEMP-FIX for pacman issue
+RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
+    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
+    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
+# TEMP-FIX for pacman issue

 # For taking screenshots of the Xfvb screen, useful during development.
 ARG SCROT
@ -77,24 +82,14 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
    ; fi \
    ; yes | pacman -Scc

+# TEMP-FIX for pacman issue
+RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
+    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
+    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
+# TEMP-FIX for pacman issue
+
 USER arch

-ENV USER arch
-
-# 5.13 problem
-ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
-
-ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
-
-ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
-
-RUN sudo pacman -Rns linux --noconfirm \
-    ; sudo pacman -Syy \
-    ; sudo pacman -S mkinitcpio --noconfirm \
-    ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
-    ; sudo rm -rf /var/tmp/.guestfs-* \
-    ; libguestfs-test-tool
-
 WORKDIR /home/arch/OSX-KVM

 RUN mkdir -p ~/.ssh \
@ -107,70 +102,41 @@ RUN mkdir -p ~/.ssh \
    && tee -a ~/.ssh/config <<< '    StrictHostKeyChecking no' \
    && tee -a ~/.ssh/config <<< '    UserKnownHostsFile=/dev/null'

-#### SPECIAL RUNTIME ARGUMENTS BELOW
-
-ENV ADDITIONAL_PORTS=
-
-# add additional QEMU boot arguments
-ENV BOOT_ARGS=
-
 ENV BOOTDISK=

-# edit the CPU that is beign emulated
-ENV CPU=Penryn
-
 ENV DISPLAY=:99

 ENV HEADLESS=false

 ENV ENV=/env

-# Boolean for generating a bootdisk with new random serials.
-ENV GENERATE_UNIQUE=false
-
-# Boolean for generating a bootdisk with specific serials.
-ENV GENERATE_SPECIFIC=false
-
 ENV IMAGE_PATH=/image
-ENV IMAGE_FORMAT=qcow2
-
-ENV KVM='accel=kvm:tcg'
-
-# ENV MASTER_PLIST_URL="https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-custom.plist"
-
-# ENV NETWORKING=e1000-82545em
-ENV NETWORKING=vmxnet3

 ENV NOPICKER=true

-# dynamic RAM options for runtime
-ENV RAM=3
-# ENV RAM=max
-# ENV RAM=half
-
 # The x and y coordinates for resolution.
 # Must be used with either -e GENERATE_UNIQUE=true or -e GENERATE_SPECIFIC=true.
 ENV WIDTH=1920
 ENV HEIGHT=1080

-# libguestfs verbose
-ENV LIBGUESTFS_DEBUG=1
-ENV LIBGUESTFS_TRACE=1
+ENV MASTER_PLIST_URL=
+ENV MASTER_PLIST=./Docker-OSX/osx-serial-generator/config-nopicker-custom.plist

-CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
-    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
+CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
+    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" || true \
    ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
        nohup Xvfb :99 -screen 0 1920x1080x16 \
        & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \
    ; } \
    ; [[ "${NOPICKER}" == true ]] && { \
        sed -i '/^.*InstallMedia.*/d' Launch.sh \
-        && export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2}" \
+        && export MASTER_PLIST="${MASTER_PLIST:-./Docker-OSX/osx-serial-generator/config-nopicker-custom.plist}" \
    ; } \
-    || export BOOTDISK="${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
+    || export MASTER_PLIST="${MASTER_PLIST:-./Docker-OSX/osx-serial-generator/config-custom.plist}" \
+    ; [[ "${MASTER_PLIST_URL}" ]] && wget -O "${MASTER_PLIST}" "${MASTER_PLIST_URL}" \
    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
-            --master-plist-url="${MASTER_PLIST_URL}" \
+            --master-plist="${MASTER_PLIST}" \
            --count 1 \
            --tsv ./serial.tsv \
            --bootdisks \
@ -178,11 +144,11 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
            --height "${HEIGHT:-1080}" \
            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
            --output-env "${ENV:=/env}" \
-    || exit 1 ; } \
+    ; } \
    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
            source "${ENV:=/env}" 2>/dev/null \
            ; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
-            --master-plist-url="${MASTER_PLIST_URL}" \
+            --master-plist="${MASTER_PLIST}" \
            --model "${DEVICE_MODEL}" \
            --serial "${SERIAL}" \
            --board-serial "${BOARD_SERIAL}" \
@ -191,5 +157,5 @@ CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/n
            --width "${WIDTH:-1920}" \
            --height "${HEIGHT:-1080}" \
            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-    || exit 1 ; } \
-    ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh
+    ; } \
+    ; ./enable-ssh.sh && envsubst < ./Launch.sh | bash
--- a/Dockerfile.naked-auto
+++ b/Dockerfile.naked-auto
@ -1,236 +0,0 @@
-#!/usr/bin/docker
-#     ____             __             ____  ______  __
-#    / __ \____  _____/ /_____  _____/ __ \/ ___/ |/ /
-#   / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \|   / 
-#  / /_/ / /_/ / /__/ ,< /  __/ /  / /_/ /___/ /   |  
-# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_|  :NAKED-AUTO
-# 
-# Title:            Docker-OSX (Mac on Docker)
-# Author:           Sick.Codes https://twitter.com/sickcodes
-# Version:          6.0
-# License:          GPLv3+
-# Repository:       https://github.com/sickcodes/Docker-OSX
-# Website:          https://sick.codes
-# 
-# This Dockerfile needs you to supply a pre-installed installation of Docker-OSX!
-# 
-# Visit https://github.com/sickcodes/Docker-OSX for info
-
-FROM sickcodes/docker-osx:latest
-
-MAINTAINER 'https://twitter.com/sickcodes' <https://sick.codes>
-
-USER root
-
-WORKDIR /root
-
-RUN rm -f /home/arch/OSX-KVM/mac_hdd_ng.img
-
-# For taking screenshots of the Xfvb screen, useful during development.
-ARG SCROT
-
-# OPTIONAL: Arch Linux server mirrors for super fast builds
-# set RANKMIRRORS to any value other that nothing, e.g. -e RANKMIRRORS=true
-ARG RANKMIRRORS
-ARG MIRROR_COUNTRY=US
-ARG MIRROR_COUNT=10
-
-RUN if [[ "${RANKMIRRORS}" ]]; then \
-        { pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
-        ; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/rankmirrors" \
-        ; wget -O- "https://www.archlinux.org/mirrorlist/?country=${MIRROR_COUNTRY:-US}&protocol=https&use_mirror_status=on" \
-        | sed -e 's/^#Server/Server/' -e '/^#/d' \
-        | head -n "$((${MIRROR_COUNT:-10}+1))" \
-        | bash ./rankmirrors --verbose --max-time 5 - > /etc/pacman.d/mirrorlist \
-        && tee -a /etc/pacman.d/mirrorlist <<< 'Server = http://mirrors.evowise.com/archlinux/$repo/os/$arch' \
-        && tee -a /etc/pacman.d/mirrorlist <<< 'Server = http://mirror.rackspace.com/archlinux/$repo/os/$arch' \
-        && tee -a /etc/pacman.d/mirrorlist <<< 'Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch' \
-        && cat /etc/pacman.d/mirrorlist \
-    ; fi \
-    ; yes | pacman -Scc
-
-# For taking screenshots of the Xfvb screen, useful during development.
-ARG SCROT
-
-RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noconfirm \
-    && if [[ "${SCROT}" ]]; then \
-        pacman -Syu scrot base-devel --noconfirm \
-        && git clone --recurse-submodules --depth 1 https://github.com/stolk/imcat.git \
-        && cd imcat \
-        && make \
-        && sudo cp imcat /usr/bin/imcat \
-        && touch /usr/bin/scrotcat \
-        && tee -a /usr/bin/scrotcat <<< '/usr/bin/imcat <(scrot -o /dev/stdout)' \
-        && chmod +x /usr/bin/scrotcat \
-    ; else \
-        touch /usr/bin/scrotcat \
-        && echo echo >> /usr/bin/scrotcat \
-        && chmod +x /usr/bin/scrotcat \
-    ; fi \
-    ; yes | pacman -Scc
-
-USER arch
-
-ENV USER arch
-
-# 5.13 problem
-ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
-
-ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
-
-ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
-
-RUN sudo pacman -Rns linux --noconfirm \
-    ; sudo pacman -Syy \
-    ; sudo pacman -S mkinitcpio --noconfirm \
-    ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
-    ; sudo rm -rf /var/tmp/.guestfs-* \
-    ; libguestfs-test-tool
-
-WORKDIR /home/arch/OSX-KVM
-
-RUN mkdir -p ~/.ssh \
-    && touch ~/.ssh/authorized_keys \
-    && touch ~/.ssh/config \
-    && chmod 700 ~/.ssh \
-    && chmod 600 ~/.ssh/config \
-    && chmod 600 ~/.ssh/authorized_keys \
-    && tee -a ~/.ssh/config <<< 'Host *' \
-    && tee -a ~/.ssh/config <<< '    StrictHostKeyChecking no' \
-    && tee -a ~/.ssh/config <<< '    UserKnownHostsFile=/dev/null'
-
-ARG COMPLETE=
-
-# use the COMPLETE arg, for a complete image, ready to boot.
-# otherwise use your own image: -v "$PWD/disk.img":/image
-ARG WGET_OPTIONS=
-# ARG WGET_OPTIONS='--no-verbose'
-
-# Feel free to take a copy of this image and then host it internally
-ARG IMAGE_URL=
-# ARG IMAGE_URL='https://images.sick.codes/mac_hdd_ng_auto_big_sur.img'
-
-RUN if [[ "${COMPLETE}" ]]; then \
-        echo "Downloading your image... This step might take a while... Press Ctrl+C if you want to abort." \
-        ; rm -f /home/arch/OSX-KVM/mac_hdd_ng.img \
-        && wget ${WGET_OPTIONS} -O /home/arch/OSX-KVM/mac_hdd_ng.img "${IMAGE_URL}" \
-    ; fi
-
-#### SPECIAL RUNTIME ARGUMENTS BELOW
-
-ENV ADDITIONAL_PORTS=
-
-# add additional QEMU boot arguments
-ENV BOOT_ARGS=
-
-ENV BOOTDISK=
-
-# edit the CPU that is beign emulated
-ENV CPU=Penryn
-
-ENV DISPLAY=:99
-
-ENV HEADLESS=false
-
-ENV ENV=/env
-
-# Boolean for generating a bootdisk with new random serials.
-ENV GENERATE_UNIQUE=false
-
-# Boolean for generating a bootdisk with specific serials.
-ENV GENERATE_SPECIFIC=false
-
-ENV IMAGE_PATH=/image
-ENV IMAGE_FORMAT=qcow2
-
-ENV KVM='accel=kvm:tcg'
-
-# ENV MASTER_PLIST_URL="https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-custom.plist"
-
-# ENV NETWORKING=e1000-82545em
-ENV NETWORKING=vmxnet3
-
-ENV NOPICKER=true
-
-# set the username and password for automatically logging in
-ENV USERNAME=user
-ENV PASSWORD=alpine
-
-# dynamic RAM options for runtime
-ENV RAM=3
-# ENV RAM=max
-# ENV RAM=half
-
-# The x and y coordinates for resolution.
-# Must be used with either -e GENERATE_UNIQUE=true or -e GENERATE_SPECIFIC=true.
-ENV WIDTH=1920
-ENV HEIGHT=1080
-
-# libguestfs verbose
-ENV LIBGUESTFS_DEBUG=1
-ENV LIBGUESTFS_TRACE=1
-
-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 echo "${BOILERPLATE}" \
-    ; [[ "${TERMS_OF_USE}" = i_agree ]] || exit 1 \
-    ; echo "Disk is being copied between layers... Please wait a minute..." \
-    ; sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
-    ; 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.qcow2}" \
-    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
-        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
-            --master-plist-url="${MASTER_PLIST_URL}" \
-            --count 1 \
-            --tsv ./serial.tsv \
-            --bootdisks \
-            --width "${WIDTH:-1920}" \
-            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-            --output-env "${ENV:=/env}" \
-    || exit 1 ; } \
-    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
-            source "${ENV:=/env}" 2>/dev/null \
-            ; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
-            --master-plist-url="${MASTER_PLIST_URL}" \
-            --model "${DEVICE_MODEL}" \
-            --serial "${SERIAL}" \
-            --board-serial "${BOARD_SERIAL}" \
-            --uuid "${UUID}" \
-            --mac-address "${MAC_ADDRESS}" \
-            --width "${WIDTH:-1920}" \
-            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-    || exit 1 ; } \
-    ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
-        nohup Xvfb :99 -screen 0 1920x1080x16 \
-        & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \
-    ; } \
-    ; stat "${IMAGE_PATH}" \
-    ; echo "Large image is being copied between layers, please wait a minute..." \
-    ; ./enable-ssh.sh \
-    ; [[ -e ~/.ssh/id_docker_osx ]] || { \
-        /usr/bin/ssh-keygen -t rsa -f ~/.ssh/id_docker_osx -q -N "" \
-        && chmod 600 ~/.ssh/id_docker_osx \
-    ; } \
-    ; /bin/bash -c ./Launch.sh \
-    & echo "Booting Docker-OSX in the background. Please wait..." \
-    ; until [[ "$(sshpass -p${PASSWORD:=alpine} ssh-copy-id -f -i ~/.ssh/id_docker_osx.pub -p 10022 ${USERNAME:=user}@127.0.0.1)" ]]; do \
-        echo "Disk is being copied between layers. Repeating until able to copy SSH key into OSX..." \
-        ; sleep 1 \
-    ; done \
-    ; grep id_docker_osx ~/.ssh/config || { \
-        tee -a ~/.ssh/config <<< 'Host 127.0.0.1' \
-        ; tee -a ~/.ssh/config <<< "    User ${USERNAME:=user}" \
-        ; tee -a ~/.ssh/config <<< '    Port 10022' \
-        ; tee -a ~/.ssh/config <<< '    IdentityFile ~/.ssh/id_docker_osx' \
-        ; tee -a ~/.ssh/config <<< '    StrictHostKeyChecking no' \
-        ; tee -a ~/.ssh/config <<< '    UserKnownHostsFile=/dev/null' \
-    ; } \
-    && ssh -i ~/.ssh/id_docker_osx ${USERNAME:=user}@127.0.0.1 -p 10022 "${OSX_COMMANDS}"
--- a/README.md
+++ b/README.md
--- a/custom/generate-specific-bootdisk.sh
+++ b/custom/generate-specific-bootdisk.sh
@ -210,7 +210,7 @@ download_qcow_efi_folder () {
    # EFI Shell commands
    touch startup.nsh && echo 'fs0:\EFI\BOOT\BOOTx64.efi' > startup.nsh

-    cp -a "${EFI_FOLDER}" .
+    cp -ra "${EFI_FOLDER}" .

    mkdir -p ./EFI/OC/Resources

--- a/custom/generate-unique-machine-values.sh
+++ b/custom/generate-unique-machine-values.sh
@ -243,7 +243,7 @@ download_qcow_efi_folder () {
    # EFI Shell commands
    touch startup.nsh && echo 'fs0:\EFI\BOOT\BOOTx64.efi' > startup.nsh

-    cp -a "${EFI_FOLDER}" .
+    cp -ra "${EFI_FOLDER}" .

    mkdir -p ./EFI/OC/Resources

@ -275,30 +275,28 @@ generate_serial_sets () {
        | while IFS='\ \|\ ' read -r SERIAL BOARD_SERIAL; do
            # make a uuid...
            UUID="$(uuidgen)"
-            # bash 3-5 compatible
-            # UUID="${UUID^^}"
-            UUID="$(tr '[:lower:]' '[:upper:]' <<< "${UUID}")"
+            UUID="${UUID^^}"

            # get a random vendor specific MAC address.
            RANDOM_MAC_PREFIX="$(grep -e "${VENDOR_REGEX}" < "${MAC_ADDRESSES_FILE:=vendor_macs.tsv}" | sort --random-sort | head -n1)"
            RANDOM_MAC_PREFIX="$(cut -d$'\t' -f1 <<< "${RANDOM_MAC_PREFIX}")"
-            MAC_ADDRESS="$(printf "${RANDOM_MAC_PREFIX}:%02X:%02X:%02X" "$((RANDOM%256))" "$((RANDOM%256))" "$((RANDOM%256))")"
+            MAC_ADDRESS="$(printf "${RANDOM_MAC_PREFIX}:%02X:%02X:%02X" $[RANDOM%256] $[RANDOM%256] $[RANDOM%256])"

            [ -z "${WIDTH}" ] && WIDTH=1920
            [ -z "${HEIGHT}" ] && HEIGHT=1080

            # append to csv file
-            tee -a "${CSV_SERIAL_SETS_FILE}" <<EOF
+            cat <<EOF >> "${CSV_SERIAL_SETS_FILE}"
 "${DEVICE_MODEL}","${SERIAL}","${BOARD_SERIAL}","${UUID}","${MAC_ADDRESS}","${WIDTH}","${HEIGHT}"
 EOF
            echo "Wrote CSV to: ${CSV_SERIAL_SETS_FILE}"

            # append to tsv file
            T=$'\t'
-            tee -a "${TSV_SERIAL_SETS_FILE}" <<EOF
+            cat <<EOF >> "${TSV_SERIAL_SETS_FILE}"
 ${DEVICE_MODEL}${T}${SERIAL}${T}${BOARD_SERIAL}${T}${UUID}${T}${MAC_ADDRESS}${T}${WIDTH}${T}${HEIGHT}
 EOF
-            echo "Wrote TSV to: ${TSV_SERIAL_SETS_FILE}"
+            echo "Wrote CSV to: ${TSV_SERIAL_SETS_FILE}"

            # if any of these are on, we need the env file.
            if [ "${CREATE_ENVS}" ] || [ "${CREATE_PLISTS}" ] || [ "${CREATE_BOOTDISKS}" ] || [ "${OUTPUT_BOOTDISK}" ] || [ "${OUTPUT_ENV}" ]; then
@ -384,9 +382,7 @@ EOF
    [ -d "${OUTPUT_DIRECTORY}" ] || mkdir -p "${OUTPUT_DIRECTORY}"
    [ -e ./macserial ] || build_mac_serial
    download_vendor_mac_addresses
-    if [ "${CREATE_BOOTDISKS}" ] || [ "${OUTPUT_BOOTDISK}" ]; then
-        download_qcow_efi_folder
-    fi
+    download_qcow_efi_folder
    generate_serial_sets
    echo "${SERIAL_SETS_FILE}"    
 }
--- a/discord-logo.svg
+++ b/discord-logo.svg
@ -1,14 +0,0 @@
-<!-- animated SVG is from https://github.com/NNTin/discord-logo -->
-<svg width="90" height="90" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" class="discord-logo-container" viewBox="0 0 48 48">
-    <defs>
-        <g>
-            <path id="discord-logo" d="m40,12c0,0 -4.585,-3.588 -10,-4l-0.488,0.976c4.896,1.198 7.142,2.915 9.488,5.024c-4.045,-2.065 -8.039,-4 -15,-4s-10.955,1.935 -15,4c2.346,-2.109 5.018,-4.015 9.488,-5.024l-0.488,-0.976c-5.681,0.537 -10,4 -10,4s-5.121,7.425 -6,22c5.162,5.953 13,6 13,6l1.639,-2.185c-2.782,-0.967 -5.924,-2.694 -8.639,-5.815c3.238,2.45 8.125,5 16,5s12.762,-2.55 16,-5c-2.715,3.121 -5.857,4.848 -8.639,5.815l1.639,2.185c0,0 7.838,-0.047 13,-6c-0.879,-14.575 -6,-22 -6,-22zm-22.5,18c-1.933,0 -3.5,-1.791 -3.5,-4c0,-2.209 1.567,-4 3.5,-4s3.5,1.791 3.5,4c0,2.209 -1.567,4 -3.5,4zm13,0c-1.933,0 -3.5,-1.791 -3.5,-4c0,-2.209 1.567,-4 3.5,-4s3.5,1.791 3.5,4c0,2.209 -1.567,4 -3.5,4z" />
-        </g>
-    </defs>
-    <g class="discord-logo">
-        <use class="discord-original" href="#discord-logo">
-        </use>
-        <animateTransform attributeName="transform" type="rotate" values="0 24 24;-18 24 24;16.8 24 24;-11.4 24 24;8.7 24 24;-7.5 24 24;6 24 24;-4.8 24 24;3.79 24 24;-3.12 24 24;2.52 24 24;-2.01 24 24;1.56 24 24;-1.2 24 24;0.96 24 24;-0.75 24 24;0.6 24 24;-0.48 24 24;0.384 24 24;0 24 24;0 24 24;0 24 24;0 24 24;0 24 24;0 24 24" begin="0s" dur="2s" fill="freeze" repeatCount="indefinite" />
-    </g>
-    <animate fill="freeze" dur="0000ms" begin="0s" values="#17f018;#000000;#17f018;#000000;#17f018;#000000;#17f018;#000000;#17f018" calMode="linear" attributeName="fill" repeatCount="indefinite" />
-</svg>
--- a/fetch-macOS.py
+++ b/fetch-macOS.py
@ -1,447 +0,0 @@
-#!/usr/bin/env python3
-# encoding: utf-8
-#
-# https://github.com/munki/macadmin-scripts/blob/master/installinstallmacos.py
-#
-# Copyright 2017 Greg Neagle.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Thanks to Tim Sutton for ideas, suggestions, and sample code.
-#
-# Updated in May of 2019 by Dhiru Kholia.
-
-'''installinstallmacos.py
-A tool to download the parts for an Install macOS app from Apple's
-softwareupdate servers and install a functioning Install macOS app onto an
-empty disk image'''
-
-# https://github.com/foxlet/macOS-Simple-KVM/blob/master/tools/FetchMacOS/fetch-macos.py
-# is pretty similar.
-
-
-# Bad hack
-import warnings
-
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-
-import os
-import gzip
-import argparse
-import plistlib
-import subprocess
-
-from xml.dom import minidom
-from xml.parsers.expat import ExpatError
-
-
-import sys
-
-if sys.version_info[0] < 3:
-    import urlparse as urlstuff
-else:
-    import urllib.parse as urlstuff
-# Quick fix for python 3.9 and above
-if sys.version_info[0] == 3 and sys.version_info[1] >= 9:
-    from types import MethodType
-
-    def readPlist(self,filepath):
-        with open(filepath, 'rb') as f:
-            p = plistlib._PlistParser(dict)
-            rootObject = p.parse(f)
-        return rootObject
-    # adding the method readPlist() to plistlib
-    plistlib.readPlist = MethodType(readPlist, plistlib)
-
-# https://github.com/foxlet/macOS-Simple-KVM/blob/master/tools/FetchMacOS/fetch-macos.py (unused)
-# https://github.com/munki/macadmin-scripts
-catalogs = {
-    "CustomerSeed": "https://swscan.apple.com/content/catalogs/others/index-10.16customerseed-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog",
-    "DeveloperSeed": "https://swscan.apple.com/content/catalogs/others/index-10.16seed-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog",
-    "PublicSeed": "https://swscan.apple.com/content/catalogs/others/index-10.16beta-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog",
-    "PublicRelease": "https://swscan.apple.com/content/catalogs/others/index-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog",
-    "20": "https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
-}
-
-
-def get_default_catalog():
-    '''Returns the default softwareupdate catalog for the current OS'''
-    return catalogs["20"]
-    # return catalogs["PublicRelease"]
-    # return catalogs["DeveloperSeed"]
-
-
-class ReplicationError(Exception):
-    '''A custom error when replication fails'''
-    pass
-
-
-def cmd_exists(cmd):
-    return subprocess.Popen("type " + cmd, shell=True,
-                           stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-
-def replicate_url(full_url,
-                  root_dir='/tmp',
-                  show_progress=False,
-                  ignore_cache=False,
-                  attempt_resume=False, installer=False, product_title=""):
-    '''Downloads a URL and stores it in the same relative path on our
-    filesystem. Returns a path to the replicated file.'''
-
-    # hack
-    print("[+] Fetching %s" % full_url)
-    if installer and "BaseSystem.dmg" not in full_url and "Big Sur" not in product_title:
-        return
-    if "Big Sur" in product_title and "InstallAssistant.pkg" not in full_url:
-        return
-    attempt_resume = True
-    # path = urllib.parse.urlsplit(full_url)[2]
-    path = urlstuff.urlsplit(full_url)[2]
-    relative_url = path.lstrip('/')
-    relative_url = os.path.normpath(relative_url)
-    # local_file_path = os.path.join(root_dir, relative_url)
-    local_file_path = relative_url
-    # print("Downloading %s..." % full_url)
-
-    if cmd_exists('wget'):
-        if not installer:
-            download_cmd = ['wget', "-c", "--quiet", "-x", "-nH", full_url]
-            # this doesn't work as there are multiple metadata files with the same name!
-            # download_cmd = ['wget', "-c", "--quiet", full_url]
-        else:
-            download_cmd = ['wget', "-c", full_url]
-    else:
-        if not installer:
-            download_cmd = ['curl', "--silent", "--show-error", "-o", local_file_path, "--create-dirs", full_url]
-        else:
-            local_file_path = os.path.basename(local_file_path)
-            download_cmd = ['curl', "-o", local_file_path, full_url]
-
-    try:
-        subprocess.check_call(download_cmd)
-    except subprocess.CalledProcessError as err:
-        raise ReplicationError(err)
-    return local_file_path
-
-
-def parse_server_metadata(filename):
-    '''Parses a softwareupdate server metadata file, looking for information
-    of interest.
-    Returns a dictionary containing title, version, and description.'''
-    title = ''
-    vers = ''
-    try:
-        md_plist = plistlib.readPlist(filename)
-    except (OSError, IOError, ExpatError) as err:
-        print('Error reading %s: %s' % (filename, err), file=sys.stderr)
-        return {}
-    vers = md_plist.get('CFBundleShortVersionString', '')
-    localization = md_plist.get('localization', {})
-    preferred_localization = (localization.get('English') or
-                              localization.get('en'))
-    if preferred_localization:
-        title = preferred_localization.get('title', '')
-
-    metadata = {}
-    metadata['title'] = title
-    metadata['version'] = vers
-
-    """
-    {'title': 'macOS Mojave', 'version': '10.14.5'}
-    {'title': 'macOS Mojave', 'version': '10.14.6'}
-    """
-    return metadata
-
-
-def get_server_metadata(catalog, product_key, workdir, ignore_cache=False):
-    '''Replicate ServerMetaData'''
-    try:
-        url = catalog['Products'][product_key]['ServerMetadataURL']
-        try:
-            smd_path = replicate_url(
-                url, root_dir=workdir, ignore_cache=ignore_cache)
-            return smd_path
-        except ReplicationError as err:
-            print('Could not replicate %s: %s' % (url, err), file=sys.stderr)
-            return None
-    except KeyError:
-        # print('Malformed catalog.', file=sys.stderr)
-        return None
-
-
-def parse_dist(filename):
-    '''Parses a softwareupdate dist file, returning a dict of info of
-    interest'''
-    dist_info = {}
-    try:
-        dom = minidom.parse(filename)
-    except ExpatError:
-        print('Invalid XML in %s' % filename, file=sys.stderr)
-        return dist_info
-    except IOError as err:
-        print('Error reading %s: %s' % (filename, err), file=sys.stderr)
-        return dist_info
-
-    titles = dom.getElementsByTagName('title')
-    if titles:
-        dist_info['title_from_dist'] = titles[0].firstChild.wholeText
-
-    auxinfos = dom.getElementsByTagName('auxinfo')
-    if not auxinfos:
-        return dist_info
-    auxinfo = auxinfos[0]
-    key = None
-    value = None
-    children = auxinfo.childNodes
-    # handle the possibility that keys from auxinfo may be nested
-    # within a 'dict' element
-    dict_nodes = [n for n in auxinfo.childNodes
-                  if n.nodeType == n.ELEMENT_NODE and
-                  n.tagName == 'dict']
-    if dict_nodes:
-        children = dict_nodes[0].childNodes
-    for node in children:
-        if node.nodeType == node.ELEMENT_NODE and node.tagName == 'key':
-            key = node.firstChild.wholeText
-        if node.nodeType == node.ELEMENT_NODE and node.tagName == 'string':
-            value = node.firstChild.wholeText
-        if key and value:
-            dist_info[key] = value
-            key = None
-            value = None
-    return dist_info
-
-
-def download_and_parse_sucatalog(sucatalog, workdir, ignore_cache=False):
-    '''Downloads and returns a parsed softwareupdate catalog'''
-    try:
-        localcatalogpath = replicate_url(
-            sucatalog, root_dir=workdir, ignore_cache=ignore_cache)
-    except ReplicationError as err:
-        print('Could not replicate %s: %s' % (sucatalog, err), file=sys.stderr)
-        exit(-1)
-    if os.path.splitext(localcatalogpath)[1] == '.gz':
-        with gzip.open(localcatalogpath) as the_file:
-            content = the_file.read()
-            try:
-                catalog = plistlib.readPlistFromString(content)
-                return catalog
-            except ExpatError as err:
-                print('Error reading %s: %s' % (localcatalogpath, err), file=sys.stderr)
-                exit(-1)
-    else:
-        try:
-            catalog = plistlib.readPlist(localcatalogpath)
-            return catalog
-        except (OSError, IOError, ExpatError) as err:
-            print('Error reading %s: %s' % (localcatalogpath, err), file=sys.stderr)
-            exit(-1)
-
-
-def find_mac_os_installers(catalog):
-    '''Return a list of product identifiers for what appear to be macOS
-    installers'''
-    mac_os_installer_products = []
-    if 'Products' in catalog:
-        for product_key in catalog['Products'].keys():
-            product = catalog['Products'][product_key]
-            try:
-                if product['ExtendedMetaInfo'][
-                        'InstallAssistantPackageIdentifiers']:
-                    mac_os_installer_products.append(product_key)
-            except KeyError:
-                continue
-
-    return mac_os_installer_products
-
-
-def os_installer_product_info(catalog, workdir, ignore_cache=False):
-    '''Returns a dict of info about products that look like macOS installers'''
-    product_info = {}
-    installer_products = find_mac_os_installers(catalog)
-    for product_key in installer_products:
-        product_info[product_key] = {}
-        filename = get_server_metadata(catalog, product_key, workdir)
-        if filename:
-            product_info[product_key] = parse_server_metadata(filename)
-        else:
-            # print('No server metadata for %s' % product_key)
-            product_info[product_key]['title'] = None
-            product_info[product_key]['version'] = None
-
-        product = catalog['Products'][product_key]
-        product_info[product_key]['PostDate'] = product['PostDate']
-        distributions = product['Distributions']
-        dist_url = distributions.get('English') or distributions.get('en')
-        try:
-            dist_path = replicate_url(
-                dist_url, root_dir=workdir, ignore_cache=ignore_cache)
-        except ReplicationError as err:
-            print('Could not replicate %s: %s' % (dist_url, err),
-                  file=sys.stderr)
-        else:
-            dist_info = parse_dist(dist_path)
-            product_info[product_key]['DistributionPath'] = dist_path
-            product_info[product_key].update(dist_info)
-            if not product_info[product_key]['title']:
-                product_info[product_key]['title'] = dist_info.get('title_from_dist')
-            if not product_info[product_key]['version']:
-                product_info[product_key]['version'] = dist_info.get('VERSION')
-
-    return product_info
-
-
-def replicate_product(catalog, product_id, workdir, ignore_cache=False, product_title=""):
-    '''Downloads all the packages for a product'''
-    product = catalog['Products'][product_id]
-    for package in product.get('Packages', []):
-        # TO-DO: Check 'Size' attribute and make sure
-        # we have enough space on the target
-        # filesystem before attempting to download
-        if 'URL' in package:
-            try:
-                replicate_url(
-                    package['URL'], root_dir=workdir,
-                    show_progress=True, ignore_cache=ignore_cache,
-                    attempt_resume=(not ignore_cache), installer=True, product_title=product_title)
-            except ReplicationError as err:
-                print('Could not replicate %s: %s' % (package['URL'], err), file=sys.stderr)
-                exit(-1)
-        if 'MetadataURL' in package:
-            try:
-                replicate_url(package['MetadataURL'], root_dir=workdir,
-                              ignore_cache=ignore_cache, installer=True)
-            except ReplicationError as err:
-                print('Could not replicate %s: %s' % (package['MetadataURL'], err), file=sys.stderr)
-                exit(-1)
-
-
-def find_installer_app(mountpoint):
-    '''Returns the path to the Install macOS app on the mountpoint'''
-    applications_dir = os.path.join(mountpoint, 'Applications')
-    for item in os.listdir(applications_dir):
-        if item.endswith('.app'):
-            return os.path.join(applications_dir, item)
-    return None
-
-
-def determine_version(version, product_info):
-    if version:
-        if version == 'latest':
-            from distutils.version import StrictVersion
-            latest_version = StrictVersion('0.0.0')
-            for index, product_id in enumerate(product_info):
-                d = product_info[product_id]['version']
-                if d > latest_version:
-                    latest_version = d
-
-            if latest_version == StrictVersion("0.0.0"):
-                print("Could not find latest version {}")
-                exit(1)
-
-            version = str(latest_version)
-
-        for index, product_id in enumerate(product_info):
-            v = product_info[product_id]['version']
-            if v == version:
-                return product_id, product_info[product_id]['title']
-
-        print("Could not find version {}. Versions available are:".format(version))
-        for _, pid in enumerate(product_info):
-            print("- {}".format(product_info[pid]['version']))
-
-        exit(1)
-
-    # display a menu of choices (some seed catalogs have multiple installers)
-    print('%2s %12s %10s %11s  %s' % ('#', 'ProductID', 'Version',
-                                           'Post Date', 'Title'))
-    for index, product_id in enumerate(product_info):
-        print('%2s %12s %10s %11s  %s' % (
-            index + 1,
-            product_id,
-            product_info[product_id]['version'],
-            product_info[product_id]['PostDate'].strftime('%Y-%m-%d'),
-            product_info[product_id]['title']
-        ))
-
-    answer = input(
-        '\nChoose a product to download (1-%s): ' % len(product_info))
-    try:
-        index = int(answer) - 1
-        if index < 0:
-            raise ValueError
-        product_id = list(product_info.keys())[index]
-        return product_id, product_info[product_id]['title']
-    except (ValueError, IndexError):
-        pass
-
-    print('Invalid input provided.')
-    exit(0)
-
-
-def main():
-    '''Do the main thing here'''
-    """
-    if os.getuid() != 0:
-        sys.exit('This command requires root (to install packages), so please '
-                 'run again with sudo or as root.')
-    """
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--workdir', metavar='path_to_working_dir',
-                        default='.',
-                        help='Path to working directory on a volume with over '
-                             '10G of available space. Defaults to current working '
-                             'directory.')
-    parser.add_argument('--version', metavar='version',
-                        default=None,
-                        help='The version to download in the format of '
-                             '"$major.$minor.$patch", e.g. "10.15.4". Can '
-                             'be "latest" to download the latest version.')
-    parser.add_argument('--compress', action='store_true',
-                        help='Output a read-only compressed disk image with '
-                             'the Install macOS app at the root. This is now the '
-                             'default. Use --raw to get a read-write sparse image '
-                             'with the app in the Applications directory.')
-    parser.add_argument('--raw', action='store_true',
-                        help='Output a read-write sparse image '
-                             'with the app in the Applications directory. Requires '
-                             'less available disk space and is faster.')
-    parser.add_argument('--ignore-cache', action='store_true',
-                        help='Ignore any previously cached files.')
-    args = parser.parse_args()
-
-    su_catalog_url = get_default_catalog()
-    if not su_catalog_url:
-        print('Could not find a default catalog url for this OS version.', file=sys.stderr)
-        exit(-1)
-
-    # download sucatalog and look for products that are for macOS installers
-    catalog = download_and_parse_sucatalog(
-        su_catalog_url, args.workdir, ignore_cache=args.ignore_cache)
-    product_info = os_installer_product_info(
-        catalog, args.workdir, ignore_cache=args.ignore_cache)
-
-    if not product_info:
-        print('No macOS installer products found in the sucatalog.', file=sys.stderr)
-        exit(-1)
-
-    product_id, product_title = determine_version(args.version, product_info)
-    print(product_id, product_title)
-
-    # download all the packages for the selected product
-    replicate_product(catalog, product_id, args.workdir, ignore_cache=args.ignore_cache, product_title=product_title)
-
-
-if __name__ == '__main__':
-    main()
--- a/2
+++ b/2
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@ -1,112 +0,0 @@
-#!/usr/bin/docker
-#     ____             __             ____  ______  __
-#    / __ \____  _____/ /_____  _____/ __ \/ ___/ |/ /
-#   / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \|   /
-#  / /_/ / /_/ / /__/ ,< /  __/ /  / /_/ /___/ /   |
-# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_| TEST SUITE FOR TESTING SMALL CHANGES
-#
-# Title:            Docker-OSX (Mac on Docker)
-# Author:           Sick.Codes https://twitter.com/sickcodes
-# Version:          6.0
-# License:          GPLv3+
-# Repository:       https://github.com/sickcodes/Docker-OSX
-# Website:          https://sick.codes
-#
-
-FROM sickcodes/docker-osx:latest
-
-RUN echo "Replace me" && exit 1
-
-#### SPECIAL RUNTIME ARGUMENTS BELOW
-
-# env -e ADDITIONAL_PORTS with a comma
-# for example, -e ADDITIONAL_PORTS=hostfwd=tcp::23-:23,
-ENV ADDITIONAL_PORTS=
-
-# add additional QEMU boot arguments
-ENV BOOT_ARGS=
-
-ENV BOOTDISK=
-
-# edit the CPU that is being emulated
-ENV CPU=Penryn
-ENV CPUID_FLAGS='vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,'
-
-ENV DISPLAY=:0.0
-
-# Deprecated
-ENV ENV=/env
-
-# Boolean for generating a bootdisk with new random serials.
-ENV GENERATE_UNIQUE=false
-
-# Boolean for generating a bootdisk with specific serials.
-ENV GENERATE_SPECIFIC=false
-
-ENV IMAGE_PATH=/home/arch/OSX-KVM/mac_hdd_ng.img
-ENV IMAGE_FORMAT=qcow2
-
-ENV KVM='accel=kvm:tcg'
-
-ENV MASTER_PLIST_URL="https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-nopicker-custom.plist"
-
-# Add NETDEV for bridged networking option, see https://github.com/sickcodes/Docker-OSX/issues/72
-# ENV NETDEV='tap,id=net0,ifname=tap0,script=no,downscript=no'
-# ENV NETDEV='user,id=net0,hostfwd=tcp::${INTERNAL_SSH_PORT:-10022}-:22,hostfwd=tcp::${SCREEN_SHARE_PORT:-5900}-:5900,${ADDITIONAL_PORTS}'
-
-# ENV NETWORKING=e1000-82545em
-# renamed to NETWORKING_DEVICE, but not deprecated
-ENV NETWORKING=vmxnet3
-ENV NETWORKING_DEVICE=${NETWORKING}
-
-# boolean for skipping the disk selection menu at in the boot process
-ENV NOPICKER=false
-
-# dynamic RAM options for runtime
-ENV RAM=3
-# ENV RAM=max
-# ENV RAM=half
-
-# The x and y coordinates for resolution.
-# Must be used with either -e GENERATE_UNIQUE=true or -e GENERATE_SPECIFIC=true.
-ENV WIDTH=1920
-ENV HEIGHT=1080
-
-# libguestfs verbose
-ENV LIBGUESTFS_DEBUG=1
-ENV LIBGUESTFS_TRACE=1
-
-VOLUME ["/tmp/.X11-unix"]
-
-CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
-    ; 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.qcow2}" \
-    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
-        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
-            --master-plist-url="${MASTER_PLIST_URL}" \
-            --count 1 \
-            --tsv ./serial.tsv \
-            --bootdisks \
-            --width "${WIDTH:-1920}" \
-            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-            --output-env "${ENV:=/env}" \
-    || exit 1 ; } \
-    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
-            source "${ENV:=/env}" 2>/dev/null \
-            ; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
-            --master-plist-url="${MASTER_PLIST_URL}" \
-            --model "${DEVICE_MODEL}" \
-            --serial "${SERIAL}" \
-            --board-serial "${BOARD_SERIAL}" \
-            --uuid "${UUID}" \
-            --mac-address "${MAC_ADDRESS}" \
-            --width "${WIDTH:-1920}" \
-            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-    || exit 1 ; } \
-    ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh
--- a/tests/test.sh
+++ b/tests/test.sh
@ -1,325 +0,0 @@
-#!/usr/bin/docker
-#     ____             __             ____  ______  __
-#    / __ \____  _____/ /_____  _____/ __ \/ ___/ |/ /
-#   / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \|   /
-#  / /_/ / /_/ / /__/ ,< /  __/ /  / /_/ /___/ /   |
-# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_| TESTS
-#
-# Title:            Docker-OSX (Mac on Docker)
-# Author:           Sick.Codes https://twitter.com/sickcodes
-# Version:          4.2
-# License:          GPLv3+
-# Repository:       https://github.com/sickcodes/Docker-OSX
-# Website:          https://sick.codes
-#
-# Status:           Work in progress.
-# 
-
-help_text="Usage: ./test.sh --branch <string> --repo <string>
-
-General options:
-    --branch, -b <string>               Git branch, default is master
-    --repo, -r <url>                    Alternative link to build
-    --mirror-country, -m <SS>           Two letter country code for Arch mirrors
-    --docker-username, -u <string>      Docker hub username
-    --docker-password, -p <string>      Docker hub password
-    --vnc-password, -v <string>         Choose a VNC passwd.
-
-Flags
-    --no-cache, -n                      Enable --no-cache (default already)
-    --no-no-cache, -nn                  Disable --no-cache docker builds
-    --help, -h, help                    Display this help and exit
-"
-
-# set -xeuf -o pipefail
-
-grep -i Ubuntu /proc/version || { echo "DO NOT RUN THIS ON YOUR WORKSTATION, ONLY RUN THIS ON A THROWAWAY SERVER FOR 1 TIME TESTING" && exit 1 ; }
-
-# gather arguments
-while (( "$#" )); do
-    case "${1}"  in
-
-    --help | -h | h | help ) 
-                echo "${help_text}" && exit 0
-            ;;
-
-    --branch=* | -b=* )
-                export BRANCH="${1#*=}"
-                shift
-            ;;
-    --branch* | -b* )
-                export BRANCH="${2}"
-                shift
-                shift
-            ;;
-    --repo=* | -r=* )
-                export REPO="${1#*=}"
-                shift
-            ;;
-    --repo* | -r* )
-                export REPO="${2}"
-                shift
-                shift
-            ;;
-    --mirror-country=* | -m=* )
-                export MIRROR_COUNTRY="${1#*=}"
-                shift
-            ;;
-    --mirror-country* | -m* )
-                export MIRROR_COUNTRY="${2}"
-                shift
-                shift
-            ;;
-    --vnc-password=* | -v=* | --vnc-passwd=* )
-                export VNC_PASSWORD="${1#*=}"
-                shift
-            ;;
-    --vnc-password* | -v* | --vnc-passwd* )
-                export VNC_PASSWORD="${2}"
-                shift
-                shift
-            ;;
-    --docker-username=* | -u=* )
-                export DOCKER_USERNAME="${1#*=}"
-                shift
-            ;;
-    --docker-username* | -u* )
-                export DOCKER_USERNAME="${2}"
-                shift
-                shift
-            ;;
-    --docker-password=* | -p=* )
-                export DOCKER_PASSWORD="${1#*=}"
-                shift
-            ;;
-    --docker-password* | -p* )
-                export DOCKER_PASSWORD="${2}"
-                shift
-                shift
-            ;;
-    --no-cache | -n )
-                export NO_CACHE='--no-cache'
-                shift
-            ;;
-    --no-no-cache | -nn )
-                export NO_CACHE=
-                shift
-            ;;
-    *)
-                echo "Invalid option: ${1}"
-                exit 1
-            ;;
-
-    esac
-done
-
-BRANCH="${BRANCH:=master}"
-REPO="${REPO:=https://github.com/sickcodes/Docker-OSX.git}"
-VNC_PASSWORD="${VNC_PASSWORD:=testing}"
-MIRROR_COUNTRY="${MIRROR_COUNTRY:=US}"
-NO_CACHE="${NO_CACHE:=--no-cache}"
-
-
-TEST_BUILDS=(
-'docker-osx:latest'
-'docker-osx:naked'
-'docker-osx:naked-auto'
-'docker-osx:big-sur'
-'docker-osx:monterey'
-'docker-osx:auto'
-#'docker-osx:auto-big-sur'
-)
-
-install_docker () {
-    apt remove docker docker-engine docker.io containerd runc -y \
-    ; apt install apt-transport-https ca-certificates curl gnupg-agent software-properties-common -y \
-    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg |  apt-key add - \
-    && apt-key fingerprint 0EBFCD88 \
-    && add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
-    && apt update -y \
-    && apt install docker-ce docker-ce-cli containerd.io -y \
-    && usermod -aG docker "${USER}" \
-    && su hook docker run --rm hello-world
-}
-
-install_vnc () {
-    apt update -y \
-        && apt install xorg openbox tigervnc-standalone-server tigervnc-common tigervnc-xorg-extension tigervnc-viewer -y \
-        && mkdir -p ${HOME}/.vnc \
-        && touch ~/.vnc/config \
-        && tee -a ~/.vnc/config <<< 'geometry=1920x1080' \
-        && tee -a ~/.vnc/config <<< 'localhost' \
-        && tee -a ~/.vnc/config <<< 'alwaysshared' \
-        && touch ./vnc.sh \
-        && printf '\n%s\n' \
-            'sudo rm -f /tmp/.X99-lock' \
-            'export DISPLAY=:99' \
-            '/usr/bin/Xvnc -geometry 1920x1080 -rfbauth ~/.vnc/passwd :99 &' > ./vnc.sh \
-        && tee vncpasswd_file <<< "${VNC_PASSWORD:=testing}" && echo "${VNC_PASSWORD:="$(tr -dc '[:graph:]' </dev/urandom | head -c8)"}" \
-        && vncpasswd -f < vncpasswd_file > ${HOME}/.vnc/passwd \
-        && chmod 600 ~/.vnc/passwd \
-        && apt install qemu qemu-kvm libvirt-clients libvirt-daemon-system bridge-utils virt-manager -y \
-        && sudo systemctl enable libvirtd.service \
-        && sudo systemctl enable virtlogd.service \
-        && echo 1 | sudo tee /sys/module/kvm/parameters/ignore_msrs \
-        && sudo modprobe kvm \
-        && echo 'export DISPLAY=:99' >> ~/.bashrc \
-        && printf '\n\n\n\n%s\n%s\n\n\n\n' '===========VNC_PASSWORD========== ' "$(<vncpasswd_file)"
-    # ufw allow 5999
-}
-
-install_scrotcat () {
-    apt update -y
-    apt install git curl wget vim xvfb scrot build-essential sshpass -y
-    git clone https://github.com/stolk/imcat.git
-    make -C ./imcat
-    sudo cp ./imcat/imcat /usr/bin/imcat
-    touch /usr/bin/scrotcat
-    tee -a /usr/bin/scrotcat <<< '/usr/bin/imcat <(scrot -o /dev/stdout)'
-    chmod +x /usr/bin/scrotcat
-}
-
-export_display_99 () {
-    touch ~/.bashrc
-    tee -a ~/.bashrc <<< 'export DISPLAY=:99'
-    export DISPLAY=:99
-}
-
-start_xvfb () {
-    nohup Xvfb :99 -screen 0 1920x1080x16 &
-}
-
-start_vnc () {
-    nohup bash vnc.sh &
-}
-
-enable_kvm () {
-    echo 1 | tee /sys/module/kvm/parameters/ignore_msrs
-}
-
-
-clone_repo () {
-    git clone --branch="${1}" "${2}" Docker-OSX
-}
-
-
-docker-osx:latest () {
-    docker build ${NO_CACHE} \
-        --build-arg BRANCH="${BRANCH}" \
-        --build-arg RANKMIRRORS=true \
-        --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
-        -f ./Dockerfile \
-        -t docker-osx:latest .
-    docker tag docker-osx:latest sickcodes/docker-osx:latest
-}
-
-
-docker-osx:naked () {
-    docker build ${NO_CACHE} \
-        --build-arg RANKMIRRORS=true \
-        --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
-        -f ./Dockerfile.naked \
-        -t docker-osx:naked .
-    docker tag docker-osx:naked sickcodes/docker-osx:naked
-}
-
-
-docker-osx:naked-auto () {
-    docker build ${NO_CACHE} \
-        --build-arg RANKMIRRORS=true \
-        --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
-        -f ./Dockerfile.naked-auto \
-        -t docker-osx:naked-auto .
-    docker tag docker-osx:naked-auto sickcodes/docker-osx:naked-auto
-}
-
-
-docker-osx:big-sur () {
-    docker build ${NO_CACHE} \
-        --build-arg VERSION=11 \
-        --build-arg RANKMIRRORS=true \
-        --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
-        -f ./Dockerfile \
-        -t docker-osx:big-sur .
-    docker tag docker-osx:big-sur sickcodes/docker-osx:big-sur
-}
-
-docker-osx:monterey () {
-    docker build ${NO_CACHE} \
-        --build-arg RANKMIRRORS=true \
-        --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
-        -f ./Dockerfile.monterey \
-        -t docker-osx:monterey .
-    docker tag docker-osx:monterey sickcodes/docker-osx:monterey
-}
-
-docker-osx:auto () {
-    docker build ${NO_CACHE} \
-        --build-arg RANKMIRRORS=true \
-        --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
-        -f ./Dockerfile.auto \
-        -t docker-osx:auto .
-    docker tag docker-osx:auto sickcodes/docker-osx:auto
-}
-
-docker-osx:auto-big-sur () {
-    docker build ${NO_CACHE} \
-        --build-arg RANKMIRRORS=true \
-        --build-arg MIRROR_COUNTRY="${MIRROR_COUNTRY}" \
-        --build-arg IMAGE_URL='https://images.sick.codes/mac_hdd_ng_auto_big_sur.img' \
-        -f ./Dockerfile.auto \
-        -t docker-osx:auto-big-sur .
-    docker tag docker-osx:auto-big-sur sickcodes/docker-osx:auto-big-sur
-}
-
-reset_docker_hard () {
-    systemctl disable --now docker
-    systemctl disable --now docker.socket
-    systemctl stop docker
-    systemctl stop docker.socket
-    rm -rf /var/lib/docker
-    systemctl enable --now docker
-}
-
-tee -a ~/.bashrc <<EOF ; true &&
-export DEBIAN_FRONTEND=noninteractive
-export TZ=UTC
-EOF
-export DEBIAN_FRONTEND=noninteractive \
-; export TZ=UTC \
-; ln -snf "/usr/share/zoneinfo/${TZ}" /etc/localtime \
-; tee -a /etc/timezone <<< "${TZ}" \
-; apt update -y \
-; apt-get install keyboard-configuration -y \
-; docker -v | grep '\ 20\.\|\ 19\.' || install_docker \
-; yes | apt install -y --no-install-recommends tzdata -y \
-; install_scrotcat \
-; yes | install_vnc \
-; export_display_99 \
-; echo start_xvfb \
-; start_vnc \
-; enable_kvm \
-; echo reset_docker_hard \
-; echo killall Xvfb \
-; clone_repo "${BRANCH}" "${REPO}" \
-; cd Docker-OSX \
-; for TEST_BUILD in "${TEST_BUILDS[@]}"; do
-    "${TEST_BUILD}"
-done \
-&& touch COMPLETED
-
-if [[ "${DOCKER_USERNAME}" ]] && [[ "${DOCKER_PASSWORD}" ]]; then
-    docker login --username "${DOCKER_USERNAME}" --password "${DOCKER_PASSWORD}" \
-        && docker push sickcodes/docker-osx:latest \
-        && docker push sickcodes/docker-osx:big-sur \
-        && docker push sickcodes/docker-osx:monterey \
-        && docker push sickcodes/docker-osx:naked \
-        && docker push sickcodes/docker-osx:naked-auto \
-        && docker push sickcodes/docker-osx:auto \
-        && docker push sickcodes/docker-osx:auto-big-sur \
-        && touch PUSHED
-fi
-
-# connect remotely to your server to use VNC
-# ssh -N root@1.1.1.1 -L  5999:127.0.0.1:5999
-
--- a/vnc-version/Dockerfile
+++ b/vnc-version/Dockerfile
@ -7,7 +7,7 @@
 # 
 # Title:            Mac on Docker (Docker-OSX) [VNC EDITION]
 # Author:           Sick.Codes https://sick.codes/        
-# Version:          3.1
+# Version:          3.0
 # License:          GPLv3+
 # 
 # All credits for OSX-KVM and the rest at Kholia's repo: https://github.com/kholia/osx-kvm
@ -113,7 +113,7 @@ RUN cat vnc.sh Launch.sh > Launch_custom.sh

 RUN chmod +x Launch_custom.sh

-RUN tee vncpasswd_file <<< "${VNC_PASSWORD:="$(tr -dc '[:graph:]' </dev/urandom | head -c8)"}"
+RUN tee vncpasswd_file <<< "${VNC_PASSWORD:=$(openssl rand -hex 4)}"
 RUN vncpasswd -f < vncpasswd_file > ${HOME}/.vnc/passwd

 RUN chmod 600 ~/.vnc/passwd
--- a/vnc-version/Dockerfile.nakedvnc
+++ b/vnc-version/Dockerfile.nakedvnc
@ -1,225 +0,0 @@
-#!/usr/bin/docker
-#     ____             __             ____  ______  __
-#    / __ \____  _____/ /_____  _____/ __ \/ ___/ |/ /
-#   / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \|   / 
-#  / /_/ / /_/ / /__/ ,< /  __/ /  / /_/ /___/ /   |  
-# /_____/\____/\___/_/|_|\___/_/   \____//____/_/|_|  :NAKEDVNC
-# 
-# Title:            Docker-OSX (Mac on Docker)
-# Author:           Sick.Codes https://twitter.com/sickcodes
-# Version:          4.4
-# License:          GPLv3+
-# Repository:       https://github.com/sickcodes/Docker-OSX
-# Website:          https://sick.codes
-# 
-# This image won't run unless you supply a disk image using:
-#       -v ${PWD}/mac_hdd_ng.img:/image
-# 
-# Take screenshots in the Arch container and display in terminal: scrotcat
-#
-# Build:
-# 
-#       docker build -t docker-osx:nakedvnc -f Dockerfile.nakedvnc .
-# 
-# Run headless:
-# 
-#       docker run -it --device /dev/kvm -p 50922:10022 -v ${PWD}/mac_hdd_ng.img:/image docker-osx:nakedvnc
-# 
-# Run with display:
-# 
-#       docker run -it --device /dev/kvm -p 50922:10022 -v ${PWD}/mac_hdd_ng.img:/image -e "DISPLAY=${DISPLAY:-:0.0}" -v /tmp/.X11-unix:/tmp/.X11-unix docker-osx:nakedvnc
-# 
-
-FROM sickcodes/docker-osx:latest
-
-MAINTAINER 'https://twitter.com/sickcodes' <https://sick.codes>
-
-USER root
-
-WORKDIR /root
-
-RUN rm -f /home/arch/OSX-KVM/mac_hdd_ng.img
-
-# OPTIONAL: Arch Linux server mirrors for super fast builds
-# set RANKMIRRORS to any value other that nothing, e.g. -e RANKMIRRORS=true
-ARG RANKMIRRORS
-ARG MIRROR_COUNTRY=US
-ARG MIRROR_COUNT=10
-RUN if [[ "${RANKMIRRORS}" ]]; then { pacman -Sy wget --noconfirm || pacman -Syu wget --noconfirm ; } \
-    ; wget -O ./rankmirrors "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/rankmirrors" \
-    ; wget -O- "https://www.archlinux.org/mirrorlist/?country=${MIRROR_COUNTRY:-US}&protocol=https&use_mirror_status=on" \
-    | sed -e 's/^#Server/Server/' -e '/^#/d' \
-    | head -n "$((${MIRROR_COUNT:-10}+1))" \
-    | bash ./rankmirrors --verbose --max-time 5 - > /etc/pacman.d/mirrorlist \
-    && tee -a /etc/pacman.d/mirrorlist <<< 'Server = http://mirrors.evowise.com/archlinux/$repo/os/$arch' \
-    && tee -a /etc/pacman.d/mirrorlist <<< 'Server = http://mirror.rackspace.com/archlinux/$repo/os/$arch' \
-    && tee -a /etc/pacman.d/mirrorlist <<< 'Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch' \
-    && cat /etc/pacman.d/mirrorlist ; fi
-
-# TEMP-FIX for pacman issue
-RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
-    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
-    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
-# TEMP-FIX for pacman issue
-
-# For taking screenshots of the Xfvb screen, useful during development.
-ARG SCROT
-
-RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noconfirm \
-    && if [[ "${SCROT}" ]]; then \
-        pacman -Syu scrot base-devel --noconfirm \
-        && git clone --recurse-submodules --depth 1 https://github.com/stolk/imcat.git \
-        && cd imcat \
-        && make \
-        && sudo cp imcat /usr/bin/imcat \
-        && touch /usr/bin/scrotcat \
-        && tee -a /usr/bin/scrotcat <<< '/usr/bin/imcat <(scrot -o /dev/stdout)' \
-        && chmod +x /usr/bin/scrotcat \
-    ; else \
-        touch /usr/bin/scrotcat \
-        && echo echo >> /usr/bin/scrotcat \
-        && chmod +x /usr/bin/scrotcat \
-    ; fi \
-    ; yes | pacman -Scc
-
-# TEMP-FIX for pacman issue
-RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
-    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
-    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
-# TEMP-FIX for pacman issue
-
-USER arch
-
-WORKDIR /home/arch/OSX-KVM
-
-RUN mkdir -p ~/.ssh \
-    && touch ~/.ssh/authorized_keys \
-    && touch ~/.ssh/config \
-    && chmod 700 ~/.ssh \
-    && chmod 600 ~/.ssh/config \
-    && chmod 600 ~/.ssh/authorized_keys \
-    && tee -a ~/.ssh/config <<< 'Host *' \
-    && tee -a ~/.ssh/config <<< '    StrictHostKeyChecking no' \
-    && tee -a ~/.ssh/config <<< '    UserKnownHostsFile=/dev/null'
-
-#### SPECIAL RUNTIME ARGUMENTS BELOW
-
-ENV ADDITIONAL_PORTS=
-
-# add additional QEMU boot arguments
-ENV BOOT_ARGS=
-
-ENV BOOTDISK=
-
-# edit the CPU that is beign emulated
-ENV CPU=Penryn
-
-ENV DISPLAY=:99
-
-ENV HEADLESS=false
-
-ENV ENV=/env
-
-# Boolean for generating a bootdisk with new random serials.
-ENV GENERATE_UNIQUE=false
-
-# Boolean for generating a bootdisk with specific serials.
-ENV GENERATE_SPECIFIC=false
-
-ENV IMAGE_PATH=/image
-ENV IMAGE_FORMAT=qcow2
-
-ENV KVM='accel=kvm:tcg'
-
-# ENV MASTER_PLIST_URL="https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-custom.plist"
-
-# ENV NETWORKING=e1000-82545em
-ENV NETWORKING=vmxnet3
-
-ENV NOPICKER=true
-
-# dynamic RAM options for runtime
-ENV RAM=8
-# ENV RAM=max
-# ENV RAM=half
-
-# The x and y coordinates for resolution.
-# Must be used with either -e GENERATE_UNIQUE=true or -e GENERATE_SPECIFIC=true.
-ENV WIDTH=1920
-ENV HEIGHT=1080
-
-# libguestfs verbose
-ENV LIBGUESTFS_DEBUG=1
-ENV LIBGUESTFS_TRACE=1
-
-CMD sudo touch /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}"  2>/dev/null || true \
-    ; sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDISK}" "${ENV}" 2>/dev/null || true \
-    ; { [[ "${DISPLAY}" = ':99' ]] || [[ "${HEADLESS}" == true ]] ; } && { \
-        nohup Xvfb :99 -screen 0 1920x1080x16 \
-        & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \
-    ; } \
-    ; [[ "${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.qcow2}" \
-    ; [[ "${GENERATE_UNIQUE}" == true ]] && { \
-        ./Docker-OSX/osx-serial-generator/generate-unique-machine-values.sh \
-            --master-plist-url="${MASTER_PLIST_URL}" \
-            --count 1 \
-            --tsv ./serial.tsv \
-            --bootdisks \
-            --width "${WIDTH:-1920}" \
-            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-            --output-env "${ENV:=/env}" \
-    || exit 1 ; } \
-    ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
-            source "${ENV:=/env}" 2>/dev/null \
-            ; ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
-            --master-plist-url="${MASTER_PLIST_URL}" \
-            --model "${DEVICE_MODEL}" \
-            --serial "${SERIAL}" \
-            --board-serial "${BOARD_SERIAL}" \
-            --uuid "${UUID}" \
-            --mac-address "${MAC_ADDRESS}" \
-            --width "${WIDTH:-1920}" \
-            --height "${HEIGHT:-1080}" \
-            --output-bootdisk "${BOOTDISK:=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \
-    || exit 1 ; } \
-    # ; ./enable-ssh.sh && /bin/bash -c ./Launch.sh
-
-WORKDIR /home/arch/OSX-KVM
-
-RUN sudo pacman -Syyuu --noconfirm \
-    && sudo pacman -S tigervnc xterm xorg-xhost xdotool ufw --noconfirm \
-    && mkdir -p ${HOME}/.vnc \
-    && touch ~/.vnc/config \
-    && tee -a ~/.vnc/config <<< 'geometry=1920x1080' \
-    && tee -a ~/.vnc/config <<< 'localhost' \
-    && tee -a ~/.vnc/config <<< 'alwaysshared'
-
-# TEMP-FIX for file 5.40 libguestfs issue
-RUN yes | sudo pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \
-    && patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
-    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
-    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
-# TEMP-FIX for file 5.40 libguestfs issue
-
-RUN printf '\n%s\n' \
-'sudo rm -f /tmp/.X99-lock' \
-'export DISPLAY=:99' \
-'/usr/bin/Xvnc -geometry 1920x1080 -rfbauth "${HOME}/.vnc/passwd" :99 &' > vnc.sh
-
-RUN cat vnc.sh Launch.sh > Launch_custom.sh
-
-RUN chmod +x Launch_custom.sh
-
-RUN tee vncpasswd_file <<< "${VNC_PASSWORD:="$(tr -dc '[:graph:]' </dev/urandom | head -c8)"}"
-RUN vncpasswd -f < vncpasswd_file > ${HOME}/.vnc/passwd
-
-RUN chmod 600 ~/.vnc/passwd
-RUN printf '\n\n\n\n%s\n%s\n\n\n\n' '===========VNC_PASSWORD========== ' "$(<vncpasswd_file)"
-
-CMD ./enable-ssh.sh && envsubst < ./Launch_custom.sh | bash
-
Author	SHA1	Message	Date
sickcodes	4a89aab5d5	CREDIT: @TheHackerCoding Typo in README.md #194	2021-03-15 19:28:02 +00:00
sickcodes	e9dc4aa0c2	4.2 Switch to using custom-plist at runtime. Allow -v `-v plist:/plist` plus `-e MASTER_PLIST=/plist` or `-e MASTER_PLIST_URL=https://raw.githubusercontent.com/sickcodes/osx-serial-generator/master/config-nopicker-custom.plist`	2021-03-15 19:23:18 +00:00