diff --git a/install/hardware/apple/fix-t2.sh b/install/hardware/apple/fix-t2.sh index 948828d4..90d4a7df 100644 --- a/install/hardware/apple/fix-t2.sh +++ b/install/hardware/apple/fix-t2.sh @@ -3,11 +3,16 @@ if lspci -nn | grep "106b:180[12]" >/dev/null; then echo "Detected MacBook with T2 chip. Installing support items..." + # apple-bcm-firmware-fetcher reads its firmware off an on-disk macOS volume — + # Wi-Fi firmware for T2 Macs is only legally obtainable from there. A + # single-boot install that wiped macOS has no such volume, so the fetch comes + # up empty; those machines need the firmware supplied from a macOS copy or a + # downloaded recovery image instead. omarchy-pkg-add \ linux-t2 \ linux-t2-headers \ apple-t2-audio-config \ - apple-bcm-firmware \ + apple-bcm-firmware-fetcher \ t2fanrd # Enable T2 fan control diff --git a/install/omarchy-other.packages b/install/omarchy-other.packages index ee7607a7..a6e61656 100644 --- a/install/omarchy-other.packages +++ b/install/omarchy-other.packages @@ -64,7 +64,7 @@ dell-xps13-sidecar-amps lsp-plugins-lv2 # T2 MacBook support packages -apple-bcm-firmware +apple-bcm-firmware-fetcher apple-t2-audio-config linux-t2 linux-t2-headers diff --git a/test/shell.d/t2-hardware-test.sh b/test/shell.d/t2-hardware-test.sh index 8b2c478b..850f37c5 100644 --- a/test/shell.d/t2-hardware-test.sh +++ b/test/shell.d/t2-hardware-test.sh @@ -20,6 +20,10 @@ grep -Fq 'KERNEL_CMDLINE[default]+=" intel_iommu=on iommu=pt pm_async=off mem_sl fail "T2 setup leaves optional Touch Bar customization uninstalled" ! grep -qx 'tiny-dfr' "$other_packages" || fail "the ISO no longer caches tiny-dfr" +grep -Fq 'apple-bcm-firmware-fetcher' "$fix_t2" || + fail "T2 setup installs the firmware fetcher" +grep -Fq 'apple-bcm-firmware-fetcher' "$other_packages" || + fail "the default package list installs the firmware fetcher" pass "fresh T2 setup uses t2bce-compatible suspend, fan, and Touch Bar defaults" test_tmp=$(mktemp -d)