diff --git a/README.md b/README.md index 35e76b3..6f73649 100644 --- a/README.md +++ b/README.md @@ -159,13 +159,17 @@ Or you can manually enter the values generated above: ... ... ... - Resolution {{WIDTH}}x{{HEIGHT}}@32 - SanitiseClearScreen + ... + ... + ... + boot-args + -v keepsyms=1 tlbto_us=0 vti=9 {{KERNEL_ARGS}} + ``` ``` {{DEVICE_MODEL}}, {{SERIAL}}, {{BOARD_SERIAL}}, - {{UUID}}, {{ROM}}, {{WIDTH}}, {{HEIGHT}} + {{UUID}}, {{ROM}}, {{WIDTH}}, {{HEIGHT}}, {{KERNEL_ARGS}} ``` ```bash @@ -177,6 +181,7 @@ General options: --output-dir Optionally change the script output location --width Resolution x axis length in px, default 1920 --height Resolution y axis length in px, default 1080 + --kernel-args Additional boot-args --master-plist-url Specify an alternative master plist, via URL --master-plist Optionally change the input plist --custom-plist Same as --master-plist @@ -192,7 +197,7 @@ Additional options only if you are creating ONE serial set: Custom plist placeholders: {{DEVICE_MODEL}}, {{SERIAL}}, {{BOARD_SERIAL}}, - {{UUID}}, {{ROM}}, {{WIDTH}}, {{HEIGHT}} + {{UUID}}, {{ROM}}, {{WIDTH}}, {{HEIGHT}}, {{KERNEL_ARGS}} Example: ./generate-unique-machine-values.sh --count 1 --plists --bootdisks --envs @@ -223,6 +228,7 @@ Required options: Optional options: --width Resolution x axis length in px, default 1920 --height Resolution y axis length in px, default 1080 + --kernel-args Additional boot-args --master-plist-url Specify an alternative master plist, via URL --custom-plist || --master-plist Optionally change the input plist. @@ -231,7 +237,7 @@ Optional options: --help, -h, help Display this help and exit Placeholders: {{DEVICE_MODEL}}, {{SERIAL}}, {{BOARD_SERIAL}}, {{UUID}}, - {{ROM}}, {{WIDTH}}, {{HEIGHT}} + {{ROM}}, {{WIDTH}}, {{HEIGHT}}, {{KERNEL_ARGS}} ``` Example using your serials generated earlier: @@ -248,7 +254,8 @@ CUSTOM_PLIST=https://raw.githubusercontent.com/sickcodes/osx-serial-generator/ma --mac-address A8:5C:2C:9A:46:2F \ --output-bootdisk ./OpenCore-nopicker.qcow2 \ --width 1920 \ - --height 1080 + --height 1080 \ + --kernel-args "-pmap_trace" ``` diff --git a/config-custom.plist b/config-custom.plist index 84cf328..b5644a2 100644 --- a/config-custom.plist +++ b/config-custom.plist @@ -957,7 +957,7 @@ SystemAudioVolume Rg== boot-args - -v keepsyms=1 tlbto_us=0 vti=9 + -v keepsyms=1 tlbto_us=0 vti=9 {{KERNEL_ARGS}} run-efi-updater No csr-active-config diff --git a/config-nopicker-custom.plist b/config-nopicker-custom.plist index 71f3cdd..daed0b9 100644 --- a/config-nopicker-custom.plist +++ b/config-nopicker-custom.plist @@ -957,7 +957,7 @@ SystemAudioVolume Rg== boot-args - -v keepsyms=1 tlbto_us=0 vti=9 + -v keepsyms=1 tlbto_us=0 vti=9 {{KERNEL_ARGS}} run-efi-updater No csr-active-config diff --git a/config-nopicker-legacy.plist b/config-nopicker-legacy.plist index 8c319c0..ccd444c 100644 --- a/config-nopicker-legacy.plist +++ b/config-nopicker-legacy.plist @@ -633,7 +633,7 @@ SystemAudioVolume Rg== boot-args - -v keepsyms=1 tlbto_us=0 vti=9 + -v keepsyms=1 tlbto_us=0 vti=9 {{KERNEL_ARGS}} run-efi-updater No csr-active-config diff --git a/generate-specific-bootdisk.sh b/generate-specific-bootdisk.sh index d84cee5..146abbc 100755 --- a/generate-specific-bootdisk.sh +++ b/generate-specific-bootdisk.sh @@ -24,6 +24,7 @@ Required options: Optional options: --width Resolution x axis length in px, default 1920 --height Resolution y axis length in px, default 1080 + --kernel-args Additional boot-args --input-plist-url Specify an alternative master plist, via URL --master-plist-url Same as above. --custom-plist Optionally change the input plist. @@ -252,6 +253,7 @@ generate_bootdisk () { -e s/\{\{ROM\}\}/"${ROM}"/g \ -e s/\{\{WIDTH\}\}/"${WIDTH:-1920}"/g \ -e s/\{\{HEIGHT\}\}/"${HEIGHT:-1080}"/g \ + -e s/\{\{KERNEL_ARGS\}\}/"${KERNEL_ARGS:-}"/g \ "${MASTER_PLIST}" > ./tmp.config.plist || exit 1 else cat < Optionally change the script output location --width Resolution x axis length in px, default 1920 --height Resolution y axis length in px, default 1080 + --kernel-args Additional boot-args --input-plist-url Specify an alternative master plist, via URL --master-plist-url Same as above. --custom-plist Optionally change the input plist. @@ -38,7 +39,7 @@ Additional options only if you are creating ONE serial set: Custom plist placeholders: {{DEVICE_MODEL}}, {{SERIAL}}, {{BOARD_SERIAL}}, - {{UUID}}, {{ROM}}, {{WIDTH}}, {{HEIGHT}} + {{UUID}}, {{ROM}}, {{WIDTH}}, {{HEIGHT}}, {{KERNEL_ARGS}} Example: ./generate-unique-machine-values.sh --count 1 --plists --bootdisks --envs @@ -289,14 +290,14 @@ generate_serial_sets () { # append to csv file tee -a "${CSV_SERIAL_SETS_FILE}" < "${OUTPUT_DIRECTORY}/plists/${SERIAL}.config.plist" || exit 1 fi @@ -361,11 +363,11 @@ EOF done [ -e "${CSV_SERIAL_SETS_FILE}" ] && \ - cat <(echo "DEVICE_MODEL,SERIAL,BOARD_SERIAL,UUID,MAC_ADDRESS,WIDTH,HEIGHT") "${CSV_SERIAL_SETS_FILE}" + cat <(echo "DEVICE_MODEL,SERIAL,BOARD_SERIAL,UUID,MAC_ADDRESS,WIDTH,HEIGHT,KERNEL_ARGS") "${CSV_SERIAL_SETS_FILE}" [ -e "${TSV_SERIAL_SETS_FILE}" ] && \ - cat <(printf "DEVICE_MODEL\tSERIAL\tBOARD_SERIAL\tUUID\tMAC_ADDRESS\tWIDTH\tHEIGHT\n") "${TSV_SERIAL_SETS_FILE}" + cat <(printf "DEVICE_MODEL\tSERIAL\tBOARD_SERIAL\tUUID\tMAC_ADDRESS\tWIDTH\tHEIGHT\tKERNEL_ARGS\n") "${TSV_SERIAL_SETS_FILE}" }