Add exists exits and required serial number files for building disk

This commit is contained in:
sickcodes 2021-02-26 09:25:40 +00:00
parent 258f6b455d
commit 91131a6bbb
5 changed files with 11 additions and 8 deletions

View File

@ -281,7 +281,7 @@ CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDIS
--tsv ./serial.tsv \ --tsv ./serial.tsv \
--bootdisks \ --bootdisks \
--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}" \ --output-env "${ENV:=/env}" || exit 1 \
; } \ ; } \
; [[ "${GENERATE_SPECIFIC}" == true ]] && { \ ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
source "${ENV:=/env}" \ source "${ENV:=/env}" \
@ -291,7 +291,7 @@ CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDIS
--board-serial "${BOARD_SERIAL}" \ --board-serial "${BOARD_SERIAL}" \
--uuid "${UUID}" \ --uuid "${UUID}" \
--mac-address "${MAC_ADDRESS}" \ --mac-address "${MAC_ADDRESS}" \
--output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \ --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" || exit 1 \
; } \ ; } \
; case "$(file --brief /bootdisk)" in \ ; case "$(file --brief /bootdisk)" in \
QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \ QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \

View File

@ -153,7 +153,7 @@ CMD echo "${BOILERPLATE}" \
--tsv ./serial.tsv \ --tsv ./serial.tsv \
--bootdisks \ --bootdisks \
--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}" \ --output-env "${ENV:=/env}" || exit 1 \
; } \ ; } \
; [[ "${GENERATE_SPECIFIC}" == true ]] && { \ ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
source "${ENV:=/env}" \ source "${ENV:=/env}" \
@ -163,7 +163,7 @@ CMD echo "${BOILERPLATE}" \
--board-serial "${BOARD_SERIAL}" \ --board-serial "${BOARD_SERIAL}" \
--uuid "${UUID}" \ --uuid "${UUID}" \
--mac-address "${MAC_ADDRESS}" \ --mac-address "${MAC_ADDRESS}" \
--output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \ --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" || exit 1 \
; } \ ; } \
; case "$(file --brief /bootdisk)" in \ ; case "$(file --brief /bootdisk)" in \
QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \ QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \

View File

@ -126,7 +126,7 @@ CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDIS
--tsv ./serial.tsv \ --tsv ./serial.tsv \
--bootdisks \ --bootdisks \
--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}" \ --output-env "${ENV:=/env}" || exit 1 \
; } \ ; } \
; [[ "${GENERATE_SPECIFIC}" == true ]] && { \ ; [[ "${GENERATE_SPECIFIC}" == true ]] && { \
source "${ENV:=/env}" \ source "${ENV:=/env}" \
@ -136,7 +136,7 @@ CMD sudo chown -R $(id -u):$(id -g) /dev/kvm /dev/snd "${IMAGE_PATH}" "${BOOTDIS
--board-serial "${BOARD_SERIAL}" \ --board-serial "${BOARD_SERIAL}" \
--uuid "${UUID}" \ --uuid "${UUID}" \
--mac-address "${MAC_ADDRESS}" \ --mac-address "${MAC_ADDRESS}" \
--output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" \ --output-bootdisk "${BOOTDISK:-/home/arch/OSX-KVM/OpenCore-Catalina/OpenCore.qcow2}" || exit 1 \
; } \ ; } \
; case "$(file --brief /bootdisk)" in \ ; case "$(file --brief /bootdisk)" in \
QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \ QEMU\ QCOW2\ Image* ) export BOOTDISK=/bootdisk \

View File

@ -79,7 +79,7 @@ If you run out of space, you can delete all your Docker images/history/cache by
docker pull sickcodes/docker-osx:auto docker pull sickcodes/docker-osx:auto
# boot directly into a real OSX shell with no display (Xvfb) # boot directly into a real OSX shell with no display (Xvfb) [HEADLESS]
docker run -it \ docker run -it \
--device /dev/kvm \ --device /dev/kvm \
-p 50922:10022 \ -p 50922:10022 \
@ -92,7 +92,7 @@ docker run -it \
docker pull sickcodes/docker-osx:auto docker pull sickcodes/docker-osx:auto
# boot directly into a real OSX shell with a visual display # boot directly into a real OSX shell with a visual display [NOT HEADLESS]
docker run -it \ docker run -it \
--device /dev/kvm \ --device /dev/kvm \
-p 50922:10022 \ -p 50922:10022 \
@ -144,6 +144,7 @@ Supply your own local image with `-v "${PWD}/mac_hdd_ng.img:/image"` and use `si
docker pull sickcodes/docker-osx:naked docker pull sickcodes/docker-osx:naked
# run your own image + SSH # run your own image + SSH
# change mac_hdd_ng.img
docker run -it \ docker run -it \
--device /dev/kvm \ --device /dev/kvm \
-p 50922:10022 \ -p 50922:10022 \

View File

@ -183,6 +183,8 @@ download_qcow_efi_folder () {
generate_serial_sets () { generate_serial_sets () {
[[ -e ./config-nopicker-custom.plist ]] || wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/custom-identity/custom/config-nopicker-custom.plist
[[ -e ./opencore-image-ng.sh ]] || wget https://raw.githubusercontent.com/sickcodes/Docker-OSX/custom-identity/custom/opencore-image-ng.sh && chmod +x opencore-image-ng.sh
mkdir -p "${OUTPUT_DIRECTORY}/envs" mkdir -p "${OUTPUT_DIRECTORY}/envs"
export DATE_NOW="$(date +%F-%T)" export DATE_NOW="$(date +%F-%T)"
export DEVICE_MODEL="${DEVICE_MODEL:=iMacPro1,1}" export DEVICE_MODEL="${DEVICE_MODEL:=iMacPro1,1}"