From 5aa689e8ad4fe46f1a781b394486c81831f2b3d5 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Wed, 24 Feb 2021 05:12:38 +0000 Subject: WIP: Machine unique value generator --- custom/generate-unique-machine-values.sh | 172 +++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100755 custom/generate-unique-machine-values.sh (limited to 'custom/generate-unique-machine-values.sh') diff --git a/custom/generate-unique-machine-values.sh b/custom/generate-unique-machine-values.sh new file mode 100755 index 0000000..e87905c --- /dev/null +++ b/custom/generate-unique-machine-values.sh @@ -0,0 +1,172 @@ +#!/bin/bash +# ____ __ ____ ______ __ +# / __ \____ _____/ /_____ _____/ __ \/ ___/ |/ / +# / / / / __ \/ ___/ //_/ _ \/ ___/ / / /\__ \| / +# / /_/ / /_/ / /__/ ,< / __/ / / /_/ /___/ / | +# /_____/\____/\___/_/|_|\___/_/ \____//____/_/|_| SERIALIZER +# +# Repo: https://github.com/sickcodes/Docker-OSX/ +# Title: Mac on Docker (Docker-OSX) +# Author: Sick.Codes https://sick.codes/ +# Version: 3.1 +# License: GPLv3+ + +help_text="Usage: generate-unique-machine-values.sh + +Example: + ./generate-unique-machine-values.sh --count 1 --model="iMacPro1,1" + +General options: + --count, -n, -c Number of serials to generate + --model, -m Device model, e.g. "iMacPro1,1" + --csv Optionally change the CSV output filename. + --output-dir Optionally change the script output location. + --help, -h, help Display this help and exit + +Notes: + - Default is 1 serial for "iMacPro1,1" in the current working directory. + - CSV is double quoted. + - If you do not set a CSV filename, the output will be sent to the output-dir. + - If you do not set an output-dir, the current directory will be the output directory. + - Sourcable environment variable shell files will be written to a folder, "envs". + +Author: Sick.Codes https://sick.codes/ +Project: https://github.com/sickcodes/Docker-OSX/ +" + +MACINFOPKG_VERSION=2.1.2 + +# gather arguments +while (( "$#" )); do + case "${1}" in + + --help | -h | h | help ) + echo "${help_text}" && exit 0 + ;; + + --count=* | -c=* | -n=* ) + export SERIAL_SET_COUNT="${1#*=}" + shift + ;; + --count* | -c* | -n* ) + export SERIAL_SET_COUNT="${2}" + shift + shift + ;; + + --csv=* ) + export CSV_OUTPUT_FILENAME="${1#*=}" + shift + ;; + --csv* ) + export CSV_OUTPUT_FILENAME="${2}" + shift + shift + ;; + + --output-dir=* ) + export OUTPUT_DIRECTORY="${1#*=}" + shift + ;; + --output-dir* ) + export OUTPUT_DIRECTORY="${2}" + shift + shift + ;; + + --model=* | -m=* ) + export DEVICE_MODEL="${1#*=}" + shift + ;; + --model* | -m* ) + export DEVICE_MODEL="${2}" + shift + shift + ;; + + *) + echo "Invalid option. Running with default values..." + shift + ;; + esac +done + + +build_mac_serial () { + MACINFOPKG_VERSION="${MACINFOPKG_VERSION:=2.1.2}" + wget -O "${TARBALL:=./MacInfoPkg.tar.gz}" \ + "https://github.com/acidanthera/MacInfoPkg/archive/${MACINFOPKG_VERSION:=2.1.2}.tar.gz" + tar -xzvf "${TARBALL}" + cd "./MacInfoPkg-${MACINFOPKG_VERSION}/macserial" \ + && ./build.tool 2>/dev/null \ + && cd - + mv "./MacInfoPkg-${MACINFOPKG_VERSION}/macserial/bin/macserial" . + rm -f "${TARBALL}" + rm -rf "./MacInfoPkg-${MACINFOPKG_VERSION}/" + chmod +x macserial + stat ./macserial +} + +download_vendor_mac_addresses () { + # download the MAC Address vendor list + [[ -e "${MAC_ADDRESSES_FILE:=vendor_macs.tsv}" ]] || wget -O "${MAC_ADDRESSES_FILE}" https://gitlab.com/wireshark/wireshark/-/raw/master/manuf +} + +generate_serial_sets () { + mkdir -p "${OUTPUT_DIRECTORY}/envs" + export DATE_NOW="$(date +%F-%T)" + export DEVICE_MODEL="${DEVICE_MODEL:=iMacPro1,1}" + export VENDOR_REGEX="${VENDOR_REGEX:=Apple, Inc.}" + + if [[ "${CSV_OUTPUT_FILENAME}" ]]; then + export SERIAL_SETS_FILE="${CSV_OUTPUT_FILENAME}" + else + export SERIAL_SETS_FILE="${OUTPUT_DIRECTORY}/serial_sets-${DATE_NOW}.csv" + fi + + touch "${SERIAL_SETS_FILE}" + echo "Writing serial sets to ${SERIAL_SETS_FILE}" + + ./macserial \ + --num "${SERIAL_SET_COUNT:=1}" \ + --model "${DEVICE_MODEL}" \ + | while IFS='\ \|\ ' read -r Serial BoardSerial; do + # make a uuid... + SmUUID="$(uuidgen)" + SmUUID="${SmUUID^^}" + + # 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}")" + MacAddress="$(printf "${RANDOM_MAC_PREFIX}:%02X:%02X:%02X" $[RANDOM%256] $[RANDOM%256] $[RANDOM%256])" + + echo "\"${DEVICE_MODEL}\",\"${Serial}\",\"${BoardSerial}\",\"${SmUUID}\",\"${MacAddress}\"" >> "${SERIAL_SETS_FILE}" + touch "${OUTPUT_DIRECTORY}/envs/${Serial}.env.sh" + cat < "${OUTPUT_DIRECTORY}/envs/${Serial}.env.sh" +export Type=${DEVICE_MODEL} +export Serial=${Serial} +export BoardSerial=${BoardSerial} +export SmUUID=${SmUUID} +export MacAddress=${MacAddress} +EOF + done + + cat <(echo "Type,Serial,BoardSerial,SmUUID,MacAddress") "${SERIAL_SETS_FILE}" +} + +main () { + # setting default variables if there are no options + cat < Date: Wed, 24 Feb 2021 05:29:17 +0000 Subject: Add zip, fix global variables in the serial generator. --- custom/generate-unique-machine-values.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'custom/generate-unique-machine-values.sh') diff --git a/custom/generate-unique-machine-values.sh b/custom/generate-unique-machine-values.sh index e87905c..c97db87 100755 --- a/custom/generate-unique-machine-values.sh +++ b/custom/generate-unique-machine-values.sh @@ -93,17 +93,17 @@ done build_mac_serial () { - MACINFOPKG_VERSION="${MACINFOPKG_VERSION:=2.1.2}" + export MACINFOPKG_VERSION="${MACINFOPKG_VERSION:=2.1.2}" wget -O "${TARBALL:=./MacInfoPkg.tar.gz}" \ - "https://github.com/acidanthera/MacInfoPkg/archive/${MACINFOPKG_VERSION:=2.1.2}.tar.gz" + "https://github.com/acidanthera/MacInfoPkg/archive/${MACINFOPKG_VERSION}.tar.gz" tar -xzvf "${TARBALL}" cd "./MacInfoPkg-${MACINFOPKG_VERSION}/macserial" \ - && ./build.tool 2>/dev/null \ + && ./build.tool \ && cd - mv "./MacInfoPkg-${MACINFOPKG_VERSION}/macserial/bin/macserial" . rm -f "${TARBALL}" rm -rf "./MacInfoPkg-${MACINFOPKG_VERSION}/" - chmod +x macserial + chmod +x ./macserial stat ./macserial } @@ -156,10 +156,13 @@ EOF main () { # setting default variables if there are no options + export DEVICE_MODEL="${DEVICE_MODEL:=iMacPro1,1}" + export SERIAL_SET_COUNT="${SERIAL_SET_COUNT:=1}" + export OUTPUT_DIRECTORY="${OUTPUT_DIRECTORY:=.}" cat < Date: Wed, 24 Feb 2021 05:52:17 +0000 Subject: Add config.plist and OpenCore boot disk generator to the script. --- custom/generate-unique-machine-values.sh | 50 +++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) (limited to 'custom/generate-unique-machine-values.sh') diff --git a/custom/generate-unique-machine-values.sh b/custom/generate-unique-machine-values.sh index c97db87..a93aab6 100755 --- a/custom/generate-unique-machine-values.sh +++ b/custom/generate-unique-machine-values.sh @@ -21,7 +21,10 @@ General options: --model, -m Device model, e.g. "iMacPro1,1" --csv Optionally change the CSV output filename. --output-dir Optionally change the script output location. + --help, -h, help Display this help and exit + --plists Create corresponding config.plists for each serial set. + --qcows [SLOW] Create corresponding boot disk images for each serial set. Notes: - Default is 1 serial for "iMacPro1,1" in the current working directory. @@ -29,12 +32,14 @@ Notes: - If you do not set a CSV filename, the output will be sent to the output-dir. - If you do not set an output-dir, the current directory will be the output directory. - Sourcable environment variable shell files will be written to a folder, "envs". + - config.plist files will be written to a folder, "plists". Author: Sick.Codes https://sick.codes/ Project: https://github.com/sickcodes/Docker-OSX/ " MACINFOPKG_VERSION=2.1.2 +PLIST_MASTER=config-nopicker-custom.plist # gather arguments while (( "$#" )); do @@ -84,6 +89,15 @@ while (( "$#" )); do shift ;; + --plists ) + export CREATE_PLISTS=1 + shift + ;; + --qcows ) + export CREATE_QCOWS=1 + shift + ;; + *) echo "Invalid option. Running with default values..." shift @@ -112,6 +126,21 @@ download_vendor_mac_addresses () { [[ -e "${MAC_ADDRESSES_FILE:=vendor_macs.tsv}" ]] || wget -O "${MAC_ADDRESSES_FILE}" https://gitlab.com/wireshark/wireshark/-/raw/master/manuf } +download_qcow_efi_folder () { + git clone https://github.com/kholia/OSX-KVM.git + cp -ra ./OSX-KVM/OpenCore-Catalina/EFI . + mkdir -p ./EFI/OC/Resources + # clone some Apple drivers + git clone https://github.com/acidanthera/OcBinaryData.git + + # copy said drivers into EFI/OC/Resources + cp -a ./OcBinaryData/Resources/* ./EFI/OC/Resources + + # EFI Shell commands + touch startup.nsh && echo 'fs0:\EFI\BOOT\BOOTx64.efi' > startup.nsh +} + + generate_serial_sets () { mkdir -p "${OUTPUT_DIRECTORY}/envs" export DATE_NOW="$(date +%F-%T)" @@ -149,7 +178,25 @@ export BoardSerial=${BoardSerial} export SmUUID=${SmUUID} export MacAddress=${MacAddress} EOF - done + + if [[ "${CREATE_PLISTS}" ]] || [[ "${CREATE_QCOWS}" ]]; then + mkdir -p "${OUTPUT_DIRECTORY}/plists" + sed -e s/{{DEVICE_MODEL}}/"${Type}"/g \ + -e s/{{SERIAL_OLD}}/"${Serial}"/g \ + -e s/{{BOARD_SERIAL_OLD}}/"${BoardSerial}"/g \ + -e s/{{SYSTEM_UUID_OLD}}/"${SmUUID}"/g \ + -e s/{{ROM_OLD}}/"${ROM_VALUE}"/g \ + "${PLIST_MASTER}" > "${OUTPUT_DIRECTORY}/plists/${Serial}.config.plist" || exit 1 + fi + + if [[ "${CREATE_QCOWS}" ]]; then + mkdir -p "${OUTPUT_DIRECTORY}/qcows" + ./opencore-image-ng.sh \ + --cfg "${OUTPUT_DIRECTORY}/plists/${Serial}.config.plist" \ + --img "${OUTPUT_DIRECTORY}/qcows/${Serial}.OpenCore-nopicker.qcow2" || exit 1 + fi + + done cat <(echo "Type,Serial,BoardSerial,SmUUID,MacAddress") "${SERIAL_SETS_FILE}" } @@ -167,6 +214,7 @@ EOF [[ -d "${OUTPUT_DIRECTORY}" ]] || mkdir -p "${OUTPUT_DIRECTORY}" [[ -e ./macserial ]] || build_mac_serial download_vendor_mac_addresses + download_qcow_efi_folder generate_serial_sets echo "${SERIAL_SETS_FILE}" } -- cgit v1.2.3 From 246fd12c1842da1ef03d2b6241c15e7e60731609 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Wed, 24 Feb 2021 09:46:18 +0000 Subject: TSV output, for easier scripting --- custom/generate-unique-machine-values.sh | 69 +++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 15 deletions(-) (limited to 'custom/generate-unique-machine-values.sh') diff --git a/custom/generate-unique-machine-values.sh b/custom/generate-unique-machine-values.sh index a93aab6..d754d04 100755 --- a/custom/generate-unique-machine-values.sh +++ b/custom/generate-unique-machine-values.sh @@ -13,26 +13,37 @@ help_text="Usage: generate-unique-machine-values.sh -Example: - ./generate-unique-machine-values.sh --count 1 --model="iMacPro1,1" - General options: --count, -n, -c Number of serials to generate - --model, -m Device model, e.g. "iMacPro1,1" + --model, -m Device model, e.g. 'iMacPro1,1' --csv Optionally change the CSV output filename. + --tsv Optionally change the TSV output filename. --output-dir Optionally change the script output location. --help, -h, help Display this help and exit --plists Create corresponding config.plists for each serial set. --qcows [SLOW] Create corresponding boot disk images for each serial set. +Example: + ./generate-unique-machine-values.sh --count 1 --model='iMacPro1,1' --plists --qcows + + The above example will generate a + - serial + - board serial + - uuid + - MAC address + - ROM value based on lowercase MAC address + - Boot disk qcow image. + - config.plist + Notes: - - Default is 1 serial for "iMacPro1,1" in the current working directory. + - Default is 1 serial for 'iMacPro1,1' in the current working directory. + - Default output is CSV, whereas setting the TSV option will output as tab-separated. - CSV is double quoted. - If you do not set a CSV filename, the output will be sent to the output-dir. - If you do not set an output-dir, the current directory will be the output directory. - - Sourcable environment variable shell files will be written to a folder, "envs". - - config.plist files will be written to a folder, "plists". + - Sourcable environment variable shell files will be written to a folder, 'envs'. + - config.plist files will be written to a folder, 'plists'. Author: Sick.Codes https://sick.codes/ Project: https://github.com/sickcodes/Docker-OSX/ @@ -69,6 +80,16 @@ while (( "$#" )); do shift ;; + --tsv=* ) + export TSV_OUTPUT_FILENAME="${1#*=}" + shift + ;; + --tsv* ) + export TSV_OUTPUT_FILENAME="${2}" + shift + shift + ;; + --output-dir=* ) export OUTPUT_DIRECTORY="${1#*=}" shift @@ -127,15 +148,13 @@ download_vendor_mac_addresses () { } download_qcow_efi_folder () { - git clone https://github.com/kholia/OSX-KVM.git + git clone --depth 1 https://github.com/kholia/OSX-KVM.git cp -ra ./OSX-KVM/OpenCore-Catalina/EFI . mkdir -p ./EFI/OC/Resources # clone some Apple drivers - git clone https://github.com/acidanthera/OcBinaryData.git - + git clone --depth 1 https://github.com/acidanthera/OcBinaryData.git # copy said drivers into EFI/OC/Resources cp -a ./OcBinaryData/Resources/* ./EFI/OC/Resources - # EFI Shell commands touch startup.nsh && echo 'fs0:\EFI\BOOT\BOOTx64.efi' > startup.nsh } @@ -147,8 +166,9 @@ generate_serial_sets () { export DEVICE_MODEL="${DEVICE_MODEL:=iMacPro1,1}" export VENDOR_REGEX="${VENDOR_REGEX:=Apple, Inc.}" - if [[ "${CSV_OUTPUT_FILENAME}" ]]; then - export SERIAL_SETS_FILE="${CSV_OUTPUT_FILENAME}" + if [[ "${CSV_OUTPUT_FILENAME}" ]] || [[ "${TSV_OUTPUT_FILENAME}" ]]; then + [[ ${CSV_OUTPUT_FILENAME} ]] && export CSV_SERIAL_SETS_FILE="${CSV_OUTPUT_FILENAME}" + [[ ${TSV_OUTPUT_FILENAME} ]] && export TSV_SERIAL_SETS_FILE="${TSV_OUTPUT_FILENAME}" else export SERIAL_SETS_FILE="${OUTPUT_DIRECTORY}/serial_sets-${DATE_NOW}.csv" fi @@ -169,7 +189,16 @@ generate_serial_sets () { RANDOM_MAC_PREFIX="$(cut -d$'\t' -f1 <<< "${RANDOM_MAC_PREFIX}")" MacAddress="$(printf "${RANDOM_MAC_PREFIX}:%02X:%02X:%02X" $[RANDOM%256] $[RANDOM%256] $[RANDOM%256])" - echo "\"${DEVICE_MODEL}\",\"${Serial}\",\"${BoardSerial}\",\"${SmUUID}\",\"${MacAddress}\"" >> "${SERIAL_SETS_FILE}" + # append to csv file + if [[ "${CSV_SERIAL_SETS_FILE}" ]]; then + echo "\"${DEVICE_MODEL}\",\"${Serial}\",\"${BoardSerial}\",\"${SmUUID}\",\"${MacAddress}\"" >> "${CSV_SERIAL_SETS_FILE}" + fi + + # append to tsv file + if [[ "${TSV_SERIAL_SETS_FILE}" ]]; then + printf "${DEVICE_MODEL}\t${Serial}\t${BoardSerial}\t${SmUUID}\t${MacAddress}\n" >> "${TSV_SERIAL_SETS_FILE}" + fi + touch "${OUTPUT_DIRECTORY}/envs/${Serial}.env.sh" cat < "${OUTPUT_DIRECTORY}/envs/${Serial}.env.sh" export Type=${DEVICE_MODEL} @@ -179,8 +208,12 @@ export SmUUID=${SmUUID} export MacAddress=${MacAddress} EOF + # plist required for qcows, so create anyway. if [[ "${CREATE_PLISTS}" ]] || [[ "${CREATE_QCOWS}" ]]; then mkdir -p "${OUTPUT_DIRECTORY}/plists" + source "${OUTPUT_DIRECTORY}/envs/${Serial}.env.sh" + ROM_VALUE="${MacAddress//\:/}" + ROM_VALUE="${ROM_VALUE,,}" sed -e s/{{DEVICE_MODEL}}/"${Type}"/g \ -e s/{{SERIAL_OLD}}/"${Serial}"/g \ -e s/{{BOARD_SERIAL_OLD}}/"${BoardSerial}"/g \ @@ -198,7 +231,13 @@ EOF done - cat <(echo "Type,Serial,BoardSerial,SmUUID,MacAddress") "${SERIAL_SETS_FILE}" + [[ -e "${CSV_SERIAL_SETS_FILE}" ]] && \ + cat <(echo "Type,Serial,BoardSerial,SmUUID,MacAddress") "${CSV_SERIAL_SETS_FILE}" + + + [[ -e "${TSV_SERIAL_SETS_FILE}" ]] && \ + cat <(printf "Type\tSerial\tBoardSerial\tSmUUID\tMacAddress\n") "${TSV_SERIAL_SETS_FILE}" + } main () { -- cgit v1.2.3 From 7886e0fd065bfaaa773787aed2ac055061abd388 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Wed, 24 Feb 2021 11:49:20 +0000 Subject: Add --output-env && --output-bootdisk --- custom/generate-unique-machine-values.sh | 39 +++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 8 deletions(-) (limited to 'custom/generate-unique-machine-values.sh') diff --git a/custom/generate-unique-machine-values.sh b/custom/generate-unique-machine-values.sh index d754d04..aef200b 100755 --- a/custom/generate-unique-machine-values.sh +++ b/custom/generate-unique-machine-values.sh @@ -18,14 +18,16 @@ General options: --model, -m Device model, e.g. 'iMacPro1,1' --csv Optionally change the CSV output filename. --tsv Optionally change the TSV output filename. + --output-bootdisk Optionally change the bootdisk qcow output filename. Useless when count > 1. + --output-env Optionally change the bootdisk env filename. Useless when count > 1. --output-dir Optionally change the script output location. --help, -h, help Display this help and exit --plists Create corresponding config.plists for each serial set. - --qcows [SLOW] Create corresponding boot disk images for each serial set. + --bootdisks [SLOW] Create corresponding boot disk images for each serial set. Example: - ./generate-unique-machine-values.sh --count 1 --model='iMacPro1,1' --plists --qcows + ./generate-unique-machine-values.sh --count 1 --model='iMacPro1,1' --plists --bootdisks The above example will generate a - serial @@ -100,6 +102,26 @@ while (( "$#" )); do shift ;; + --output-bootdisk=* ) + export OUTPUT_QCOW="${1#*=}" + shift + ;; + --output-bootdisk* ) + export OUTPUT_QCOW="${2}" + shift + shift + ;; + + --output-env=* ) + export OUTPUT_ENV="${1#*=}" + shift + ;; + --output-env* ) + export OUTPUT_ENV="${2}" + shift + shift + ;; + --model=* | -m=* ) export DEVICE_MODEL="${1#*=}" shift @@ -114,7 +136,7 @@ while (( "$#" )); do export CREATE_PLISTS=1 shift ;; - --qcows ) + --bootdisks ) export CREATE_QCOWS=1 shift ;; @@ -199,8 +221,9 @@ generate_serial_sets () { printf "${DEVICE_MODEL}\t${Serial}\t${BoardSerial}\t${SmUUID}\t${MacAddress}\n" >> "${TSV_SERIAL_SETS_FILE}" fi - touch "${OUTPUT_DIRECTORY}/envs/${Serial}.env.sh" - cat < "${OUTPUT_DIRECTORY}/envs/${Serial}.env.sh" + OUTPUT_ENV_FILE="${OUTPUT_ENV:-"${OUTPUT_DIRECTORY}/envs/${Serial}.env.sh"}" + touch "${OUTPUT_ENV_FILE}" + cat < "${OUTPUT_ENV_FILE}" export Type=${DEVICE_MODEL} export Serial=${Serial} export BoardSerial=${BoardSerial} @@ -208,10 +231,10 @@ export SmUUID=${SmUUID} export MacAddress=${MacAddress} EOF - # plist required for qcows, so create anyway. + # plist required for bootdisks, so create anyway. if [[ "${CREATE_PLISTS}" ]] || [[ "${CREATE_QCOWS}" ]]; then mkdir -p "${OUTPUT_DIRECTORY}/plists" - source "${OUTPUT_DIRECTORY}/envs/${Serial}.env.sh" + source "${OUTPUT_ENV_FILE}" ROM_VALUE="${MacAddress//\:/}" ROM_VALUE="${ROM_VALUE,,}" sed -e s/{{DEVICE_MODEL}}/"${Type}"/g \ @@ -226,7 +249,7 @@ EOF mkdir -p "${OUTPUT_DIRECTORY}/qcows" ./opencore-image-ng.sh \ --cfg "${OUTPUT_DIRECTORY}/plists/${Serial}.config.plist" \ - --img "${OUTPUT_DIRECTORY}/qcows/${Serial}.OpenCore-nopicker.qcow2" || exit 1 + --img "${OUTPUT_QCOW:-${OUTPUT_DIRECTORY}/qcows/${Serial}.OpenCore-nopicker.qcow2}" || exit 1 fi done -- cgit v1.2.3 From 9e5538c195b30ad55d24e4976a0f9ad67f70a446 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Thu, 25 Feb 2021 08:52:56 +0000 Subject: Add Linux, libguestfs for building bootdisks within the Docker container. Add CPU_STRING to optionally override the whole CPU string. Unify variable names in ./custom. --- custom/generate-unique-machine-values.sh | 46 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'custom/generate-unique-machine-values.sh') diff --git a/custom/generate-unique-machine-values.sh b/custom/generate-unique-machine-values.sh index aef200b..18bdc5f 100755 --- a/custom/generate-unique-machine-values.sh +++ b/custom/generate-unique-machine-values.sh @@ -201,65 +201,65 @@ generate_serial_sets () { ./macserial \ --num "${SERIAL_SET_COUNT:=1}" \ --model "${DEVICE_MODEL}" \ - | while IFS='\ \|\ ' read -r Serial BoardSerial; do + | while IFS='\ \|\ ' read -r SERIAL BOARD_SERIAL; do # make a uuid... - SmUUID="$(uuidgen)" - SmUUID="${SmUUID^^}" + UUID="$(uuidgen)" + 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}")" - MacAddress="$(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])" # append to csv file if [[ "${CSV_SERIAL_SETS_FILE}" ]]; then - echo "\"${DEVICE_MODEL}\",\"${Serial}\",\"${BoardSerial}\",\"${SmUUID}\",\"${MacAddress}\"" >> "${CSV_SERIAL_SETS_FILE}" + echo "\"${DEVICE_MODEL}\",\"${SERIAL}\",\"${BOARD_SERIAL}\",\"${UUID}\",\"${MAC_ADDRESS}\"" >> "${CSV_SERIAL_SETS_FILE}" fi # append to tsv file if [[ "${TSV_SERIAL_SETS_FILE}" ]]; then - printf "${DEVICE_MODEL}\t${Serial}\t${BoardSerial}\t${SmUUID}\t${MacAddress}\n" >> "${TSV_SERIAL_SETS_FILE}" + printf "${DEVICE_MODEL}\t${SERIAL}\t${BOARD_SERIAL}\t${UUID}\t${MAC_ADDRESS}\n" >> "${TSV_SERIAL_SETS_FILE}" fi - OUTPUT_ENV_FILE="${OUTPUT_ENV:-"${OUTPUT_DIRECTORY}/envs/${Serial}.env.sh"}" + OUTPUT_ENV_FILE="${OUTPUT_ENV:-"${OUTPUT_DIRECTORY}/envs/${SERIAL}.env.sh"}" touch "${OUTPUT_ENV_FILE}" cat < "${OUTPUT_ENV_FILE}" -export Type=${DEVICE_MODEL} -export Serial=${Serial} -export BoardSerial=${BoardSerial} -export SmUUID=${SmUUID} -export MacAddress=${MacAddress} +export DEVICE_MODEL="${DEVICE_MODEL}" +export SERIAL="${SERIAL}" +export BOARD_SERIAL="${BOARD_SERIAL}" +export UUID="${UUID}" +export MAC_ADDRESS="${MAC_ADDRESS}" EOF # plist required for bootdisks, so create anyway. if [[ "${CREATE_PLISTS}" ]] || [[ "${CREATE_QCOWS}" ]]; then mkdir -p "${OUTPUT_DIRECTORY}/plists" source "${OUTPUT_ENV_FILE}" - ROM_VALUE="${MacAddress//\:/}" + ROM_VALUE="${MAC_ADDRESS//\:/}" ROM_VALUE="${ROM_VALUE,,}" - sed -e s/{{DEVICE_MODEL}}/"${Type}"/g \ - -e s/{{SERIAL_OLD}}/"${Serial}"/g \ - -e s/{{BOARD_SERIAL_OLD}}/"${BoardSerial}"/g \ - -e s/{{SYSTEM_UUID_OLD}}/"${SmUUID}"/g \ - -e s/{{ROM_OLD}}/"${ROM_VALUE}"/g \ - "${PLIST_MASTER}" > "${OUTPUT_DIRECTORY}/plists/${Serial}.config.plist" || exit 1 + sed -e s/{{DEVICE_MODEL}}/"${DEVICE_MODEL}"/g \ + -e s/{{SERIAL}}/"${SERIAL}"/g \ + -e s/{{BOARD_SERIAL}}/"${BOARD_SERIAL}"/g \ + -e s/{{UUID}}/"${UUID}"/g \ + -e s/{{ROM}}/"${ROM}"/g \ + "${PLIST_MASTER}" > "${OUTPUT_DIRECTORY}/plists/${SERIAL}.config.plist" || exit 1 fi if [[ "${CREATE_QCOWS}" ]]; then mkdir -p "${OUTPUT_DIRECTORY}/qcows" ./opencore-image-ng.sh \ - --cfg "${OUTPUT_DIRECTORY}/plists/${Serial}.config.plist" \ - --img "${OUTPUT_QCOW:-${OUTPUT_DIRECTORY}/qcows/${Serial}.OpenCore-nopicker.qcow2}" || exit 1 + --cfg "${OUTPUT_DIRECTORY}/plists/${SERIAL}.config.plist" \ + --img "${OUTPUT_QCOW:-${OUTPUT_DIRECTORY}/qcows/${SERIAL}.OpenCore-nopicker.qcow2}" || exit 1 fi done [[ -e "${CSV_SERIAL_SETS_FILE}" ]] && \ - cat <(echo "Type,Serial,BoardSerial,SmUUID,MacAddress") "${CSV_SERIAL_SETS_FILE}" + cat <(echo "DEVICE_MODEL,SERIAL,BOARD_SERIAL,UUID,MAC_ADDRESS") "${CSV_SERIAL_SETS_FILE}" [[ -e "${TSV_SERIAL_SETS_FILE}" ]] && \ - cat <(printf "Type\tSerial\tBoardSerial\tSmUUID\tMacAddress\n") "${TSV_SERIAL_SETS_FILE}" + cat <(printf "DEVICE_MODEL\tSERIAL\BOARD_SERIAL\tUUID\tMAC_ADDRESS\n") "${TSV_SERIAL_SETS_FILE}" } -- cgit v1.2.3 From 258f6b455d14aeb449260b668a9d16478a48ac5c Mon Sep 17 00:00:00 2001 From: sickcodes Date: Fri, 26 Feb 2021 06:42:57 +0000 Subject: Fix /env permissions for persistence after GENERATE_UNIQUE. Fix the following warning by chowning /dev/kvm earlier "libguestfs: warning: current user is not a member of the KVM group (group ID 108). This user cannot access /dev/kvm, so libguestfs may run very slowly. It is recommended that you 'chmod 0666 /dev/kvm' or add the current user to the KVM group (you might need to log out and log in again)." --- custom/generate-unique-machine-values.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'custom/generate-unique-machine-values.sh') diff --git a/custom/generate-unique-machine-values.sh b/custom/generate-unique-machine-values.sh index 18bdc5f..6692e29 100755 --- a/custom/generate-unique-machine-values.sh +++ b/custom/generate-unique-machine-values.sh @@ -259,7 +259,7 @@ EOF [[ -e "${TSV_SERIAL_SETS_FILE}" ]] && \ - cat <(printf "DEVICE_MODEL\tSERIAL\BOARD_SERIAL\tUUID\tMAC_ADDRESS\n") "${TSV_SERIAL_SETS_FILE}" + cat <(printf "DEVICE_MODEL\tSERIAL\tBOARD_SERIAL\tUUID\tMAC_ADDRESS\n") "${TSV_SERIAL_SETS_FILE}" } -- cgit v1.2.3 From 91131a6bbbe92615852e14e4b8e427ebe743f3a5 Mon Sep 17 00:00:00 2001 From: sickcodes Date: Fri, 26 Feb 2021 09:25:40 +0000 Subject: Add exists exits and required serial number files for building disk --- custom/generate-unique-machine-values.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'custom/generate-unique-machine-values.sh') diff --git a/custom/generate-unique-machine-values.sh b/custom/generate-unique-machine-values.sh index 6692e29..4b2409a 100755 --- a/custom/generate-unique-machine-values.sh +++ b/custom/generate-unique-machine-values.sh @@ -183,6 +183,8 @@ download_qcow_efi_folder () { 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" export DATE_NOW="$(date +%F-%T)" export DEVICE_MODEL="${DEVICE_MODEL:=iMacPro1,1}" -- cgit v1.2.3