update to 26.4

Author: pyquick

ci_tooling/build_modules/disk_images.py

@@ -77,7 +77,7 @@ def _generate_payloads_dmg(self):
             '-megabytes', '32000',  # Overlays can only be as large as the disk image allows
             '-format', 'UDZO', '-ov',
             '-volname', 'OCLP-R Resources (Base)',
-            '-fs', 'HFS+',
+            '-fs', 'APFS',
             '-layout', 'NONE',
             '-srcfolder', './payloads',
             '-passphrase', 'password', '-encryption'

docs/TERMS.md

@@ -31,7 +31,7 @@ Term | Description
 Term | Description
 --- | ---
 **EFI**   | It can denote two things: <br/>- Mac's firmware, which is the same as UEFI, but pretty modified for Macs only, so not so "Universal" <br/>- The partition on your hard drive that stores software read by the UEFI to load OSes (like the Windows bootloader) or UEFI Applications (like OpenCore), it's FAT32 formatted and has an ID type of EF00 (in hex). It can be named ESP or SYSTEM, and it's usually from 100MB to 400MB in size but the size doesn't reflect upon anything.
-**HFS+**   | Also known as Mac OS Extended (Journaled), this was the default macOS drive format up until macOS 10.13. It was designed around spinning disks.
+**APFS**   | Also known as Mac OS Extended (Journaled), this was the default macOS drive format up until macOS 10.13. It was designed around spinning disks.
 **APFS**   | This is the default macOS drive format from macOS 10.13 and onwards for SSDs, and standard for all drives in Mojave. This format was designed primarily around SSDs.
 **32 and 64-Bit CPU**   | The bit number of a CPU determines how much data a CPU can address. <br/>- 32-Bit CPUs were only supported up-to Mac OS X 10.6, Snow Leopard.
 **32-Bit Firmware**   | The bit number of a Firmware determines how much data the firmware can address. In some older Macs, it's common to have a 64-Bit CPU with a 32-Bit firmware<br/>- 32-Bit Firmwares were only supported up-to Mac OS X 10.7, Lion.

oclp_r/support/macos_installer_handler.py

@@ -65,7 +65,7 @@ def generate_installer_creation_script(self, tmp_location: str, installer_path:
         Creates installer.sh to be piped to OCLP-Helper and run as admin
 
         Script includes:
-        - Format provided disk as HFS+ GPT
+        - Format provided disk as APFS GPT
         - Run createinstallmedia on provided disk
 
         Implementing this into a single installer.sh script allows us to only call
@@ -139,7 +139,7 @@ def generate_installer_creation_script(self, tmp_location: str, installer_path:
 
         with script_location.open("w") as script:
             script.write(f'''#!/bin/bash
-erase_disk='/usr/sbin/diskutil eraseDisk HFS+ OCLP-Installer {disk}'
+erase_disk='/usr/sbin/diskutil eraseDisk APFS OCLP-Installer {disk}'
 if $erase_disk; then
     "{createinstallmedia_path}" --volume /Volumes/OCLP-Installer --nointeraction{additional_args}
 fi