diff options
| author | sickcodes <[email protected]> | 2021-02-26 05:49:40 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-02-26 05:49:40 +0000 |
| commit | d1721028c8ca06d748e9e78c96b01bd8635a37bc (patch) | |
| tree | 990f1dd61995c94b0edb53af8d5dd8a1ea94496b /Dockerfile.naked | |
| parent | source "${ENV:=/env}" logic (diff) | |
| download | docker-osx-d1721028c8ca06d748e9e78c96b01bd8635a37bc.tar.xz docker-osx-d1721028c8ca06d748e9e78c96b01bd8635a37bc.zip | |
NOPICKER now does: `sed -i '/^.*InstallMedia.*/d' Launch.sh`
Diffstat (limited to 'Dockerfile.naked')
| -rw-r--r-- | Dockerfile.naked | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Dockerfile.naked b/Dockerfile.naked index 7c755e4..0ebc65e 100644 --- a/Dockerfile.naked +++ b/Dockerfile.naked @@ -116,7 +116,10 @@ CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null | nohup Xvfb :99 -screen 0 1920x1080x16 \ & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \ ; } \ - ; [[ "${NOPICKER}" == true ]] && export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2 \ + ; [[ "${NOPICKER}" == true ]] && { \ + sed -i '/^.*InstallMedia.*/d' Launch.sh \ + && export BOOTDISK=/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore-nopicker.qcow2 \ + ; } \ ; [[ "${GENERATE_UNIQUE}" == true ]] && { \ ./Docker-OSX/custom/generate-unique-machine-values.sh \ --count 1 \ @@ -126,7 +129,7 @@ CMD sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" "${BOOTDISK}" 2>/dev/null | --output-env "${ENV:=/env}" \ ; } \ ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \ - source "${ENV}" \ + source "${ENV:=/env}" \ || ./Docker-OSX/custom/generate-specific-bootdisk.sh \ --model "${DEVICE_MODEL}" \ --serial "${SERIAL}" \ |